Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index ff9b154..e541a6c 100755
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
@@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)
 
 size_t Print::print(const __FlashStringHelper *ifsh)
 {
-  const prog_char *p = (const prog_char *)ifsh;
+  const char PROGMEM *p = (const char PROGMEM *)ifsh;
   size_t n = 0;
   while (1) {
     unsigned char c = pgm_read_byte(p++);