diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 07:28:43 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 07:28:43 +0400 |
| commit | 2bf81c8af92dd53890557c5d87875842d573a3e9 (patch) | |
| tree | 83e7e3539599b091ac69557658c06c0a39cfa60e /arch/arm/include/asm/io.h | |
| parent | 9526d9bc23f362035cfabf044aa90f4ed1787955 (diff) | |
| parent | 5f6c4ab6ee781c9aace7c8548ad9bd87f5678df7 (diff) | |
| download | linux-2bf81c8af92dd53890557c5d87875842d573a3e9.tar.xz | |
Merge branch 'arch-microblaze' into no-rebases
Diffstat (limited to 'arch/arm/include/asm/io.h')
| -rw-r--r-- | arch/arm/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 35c1ed89b936..42f042ee4ada 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -64,7 +64,7 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); static inline void __raw_writew(u16 val, volatile void __iomem *addr) { asm volatile("strh %1, %0" - : "+Qo" (*(volatile u16 __force *)addr) + : "+Q" (*(volatile u16 __force *)addr) : "r" (val)); } @@ -72,7 +72,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr) { u16 val; asm volatile("ldrh %1, %0" - : "+Qo" (*(volatile u16 __force *)addr), + : "+Q" (*(volatile u16 __force *)addr), "=r" (val)); return val; } |