diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
commit | 1a2217a9516b134e0a0e54cb4629e1e075d97b17 (patch) | |
tree | 044db08962769ede5a6a40d331c19edd43bdbac4 /arch/avr32/mach-at32ap/include/mach/io.h | |
parent | 46b5e34029fef7a042f3ff16e319e737257e5c7b (diff) | |
parent | 6eb3ebe04da4c8f31d776217b0b76ca3d00f20b1 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix build failures in board code
avr32: Allow selecting multiple pins at once
avr32: Minor pm_power_off cleanup
avr32: Implement {read,write}[bwl]_be
avr32: Replace static clock list with dynamic linked list
avr32: Use platform_driver_probe for pdc platform driver
avr32: Use platform_driver_probe for pio platform driver
avr32: Provide a way to deselect pins in the portmux
ngw100: export J15 through sysfs
avr32: Allow fine-grained control over LCDC pins
avr32: added mem kernel command line option support
Add kernel support for oprofile callgraphs on AVR32
avr32: use the new byteorder headers
Diffstat (limited to 'arch/avr32/mach-at32ap/include/mach/io.h')
-rw-r--r-- | arch/avr32/mach-at32ap/include/mach/io.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/include/mach/io.h b/arch/avr32/mach-at32ap/include/mach/io.h index 4ec6abc68ea..22ea79b7405 100644 --- a/arch/avr32/mach-at32ap/include/mach/io.h +++ b/arch/avr32/mach-at32ap/include/mach/io.h @@ -1,8 +1,7 @@ #ifndef __ASM_AVR32_ARCH_AT32AP_IO_H #define __ASM_AVR32_ARCH_AT32AP_IO_H -/* For "bizarre" halfword swapping */ -#include <linux/byteorder/swabb.h> +#include <linux/swab.h> #if defined(CONFIG_AP700X_32_BIT_SMC) # define __swizzle_addr_b(addr) (addr ^ 3UL) |