diff --git a/[refs] b/[refs] index f59b16a5db5d..bc4841310791 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 334280fff3f7201d0fd564fe85e0a6f035ce3f68 +refs/heads/master: 216e39db112da4d25a52aeb956e7da70fdd0d94c diff --git a/trunk/include/asm-blackfin/io.h b/trunk/include/asm-blackfin/io.h index eac8bcaf64c2..142cb333db29 100644 --- a/trunk/include/asm-blackfin/io.h +++ b/trunk/include/asm-blackfin/io.h @@ -20,7 +20,7 @@ */ #ifndef __ASSEMBLY__ -static inline unsigned char readb(void __iomem *addr) +static inline unsigned char readb(const volatile void __iomem *addr) { unsigned int val; int tmp; @@ -35,7 +35,7 @@ static inline unsigned char readb(void __iomem *addr) return (unsigned char) val; } -static inline unsigned short readw(void __iomem *addr) +static inline unsigned short readw(const volatile void __iomem *addr) { unsigned int val; int tmp; @@ -50,7 +50,7 @@ static inline unsigned short readw(void __iomem *addr) return (unsigned short) val; } -static inline unsigned int readl(void __iomem *addr) +static inline unsigned int readl(const volatile void __iomem *addr) { unsigned int val; int tmp;