diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /arch/avr32/include/asm/io.h | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/avr32/include/asm/io.h')
| -rw-r--r-- | arch/avr32/include/asm/io.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h index a520f77ead96..22c97ef92201 100644 --- a/arch/avr32/include/asm/io.h +++ b/arch/avr32/include/asm/io.h | |||
| @@ -160,6 +160,14 @@ BUILDIO_IOPORT(l, u32) | |||
| 160 | #define readw_relaxed readw | 160 | #define readw_relaxed readw |
| 161 | #define readl_relaxed readl | 161 | #define readl_relaxed readl |
| 162 | 162 | ||
| 163 | #define readb_be __raw_readb | ||
| 164 | #define readw_be __raw_readw | ||
| 165 | #define readl_be __raw_readl | ||
| 166 | |||
| 167 | #define writeb_be __raw_writeb | ||
| 168 | #define writew_be __raw_writew | ||
| 169 | #define writel_be __raw_writel | ||
| 170 | |||
| 163 | #define __BUILD_MEMORY_STRING(bwl, type) \ | 171 | #define __BUILD_MEMORY_STRING(bwl, type) \ |
| 164 | static inline void writes##bwl(volatile void __iomem *addr, \ | 172 | static inline void writes##bwl(volatile void __iomem *addr, \ |
| 165 | const void *data, unsigned int count) \ | 173 | const void *data, unsigned int count) \ |