diff options
| author | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
| commit | fa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch) | |
| tree | 85a7b88c4b1f3898c606af013a478db39dc392b5 /tmk_core/common/progmem.h | |
| parent | 4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff) | |
| parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 5b27656250..a09f91be86 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) |