Merge commit 'v2.6.27-rc3' into core/urgent

1 files changed, 0 insertions, 39 deletions

diff --git a/include/asm-avr32/arch-at32ap/io.h b/include/asm-avr32/arch-at32ap/io.h
deleted file mode 100644
index 4ec6abc68ea3..000000000000
--- a/include/asm-avr32/arch-at32ap/io.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __ASM_AVR32_ARCH_AT32AP_IO_H
-#define __ASM_AVR32_ARCH_AT32AP_IO_H
-
-/* For "bizarre" halfword swapping */
-#include <linux/byteorder/swabb.h>
-
-#if defined(CONFIG_AP700X_32_BIT_SMC)
-# define __swizzle_addr_b(addr) (addr ^ 3UL)
-# define __swizzle_addr_w(addr) (addr ^ 2UL)
-# define __swizzle_addr_l(addr) (addr)
-# define ioswabb(a, x)          (x)
-# define ioswabw(a, x)          (x)
-# define ioswabl(a, x)          (x)
-# define __mem_ioswabb(a, x)    (x)
-# define __mem_ioswabw(a, x)    swab16(x)
-# define __mem_ioswabl(a, x)    swab32(x)
-#elif defined(CONFIG_AP700X_16_BIT_SMC)
-# define __swizzle_addr_b(addr) (addr ^ 1UL)
-# define __swizzle_addr_w(addr) (addr)
-# define __swizzle_addr_l(addr) (addr)
-# define ioswabb(a, x)          (x)
-# define ioswabw(a, x)          (x)
-# define ioswabl(a, x)          swahw32(x)
-# define __mem_ioswabb(a, x)    (x)
-# define __mem_ioswabw(a, x)    swab16(x)
-# define __mem_ioswabl(a, x)    swahb32(x)
-#else
-# define __swizzle_addr_b(addr) (addr)
-# define __swizzle_addr_w(addr) (addr)
-# define __swizzle_addr_l(addr) (addr)
-# define ioswabb(a, x)          (x)
-# define ioswabw(a, x)          swab16(x)
-# define ioswabl(a, x)          swab32(x)
-# define __mem_ioswabb(a, x)    (x)
-# define __mem_ioswabw(a, x)    (x)
-# define __mem_ioswabl(a, x)    (x)
-#endif
-
-#endif /* __ASM_AVR32_ARCH_AT32AP_IO_H */