convert to unix line-endings [skip ci]

[qmk_firmware.git] / tmk_core / common / progmem.h

diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h
index 199b1bedfea9f7018903420ddca146da38482a60..a09f91be866d05f43747622b44977e443c42722c 100644 (file)
--- a/tmk_core/common/progmem.h
+++ b/tmk_core/common/progmem.h
@@ -3,10 +3,10 @@
 
 #if defined(__AVR__)
 #   include <avr/pgmspace.h>
-#elif defined(__arm__)
+#else
 #   define PROGMEM
-#   define pgm_read_byte(p)     *(p)
-#   define pgm_read_word(p)     *(p)
+#   define pgm_read_byte(p)     *((unsigned char*)p)
+#   define pgm_read_word(p)     *((uint16_t*)p)
 #endif
 
 #endif