diff options
| author | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
|---|---|---|
| committer | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
| commit | d5486265b8afcada68306c815b08c225fce287af (patch) | |
| tree | 8fb7f8fee4aa3937003bd69d5c77ca867c010d12 /tmk_core/common/progmem.h | |
| parent | 738b072bb0f25d0369a998c550c369e4f64cc7a5 (diff) | |
| parent | 34c8bf47a76c8a2dcd3b1a19dd608f8fb2fafb31 (diff) | |
| download | qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.gz qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.xz | |
Merge branch 'master' into ps2avrGB
Diffstat (limited to 'tmk_core/common/progmem.h')
| -rw-r--r-- | tmk_core/common/progmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index 5b2765625..a09f91be8 100644 --- a/tmk_core/common/progmem.h +++ b/tmk_core/common/progmem.h @@ -3,7 +3,7 @@ #if defined(__AVR__) # include <avr/pgmspace.h> -#elif defined(__arm__) +#else # define PROGMEM # define pgm_read_byte(p) *((unsigned char*)p) # define pgm_read_word(p) *((uint16_t*)p) |