diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
| commit | 39b945a37bac2b692773a470890c8ba301485b15 (patch) | |
| tree | fe599a2cb77afa5dcfc3c07ef7f23933ea723f2e /include/asm-arm/arch-at91/io.h | |
| parent | 203c80187eba037f2d6562e0d5847014746726dd (diff) | |
| parent | 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-armtip-x86-idle-2008-06-16_09.18_Mon
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix tosa.c build error
[ARM] 5067/1: _raw_write_can_lock macro bugfix
[ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
[ARM] 5068/1: PXA2xx Additional gpio definitions
[ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
[ARM] 5060/1: remove unnecessary include of asm/io.h
[ARM] fix AT91 include loops
Diffstat (limited to 'include/asm-arm/arch-at91/io.h')
| -rw-r--r-- | include/asm-arm/arch-at91/io.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-at91/io.h b/include/asm-arm/arch-at91/io.h index 80073fd36b8e..f8beaa228467 100644 --- a/include/asm-arm/arch-at91/io.h +++ b/include/asm-arm/arch-at91/io.h @@ -21,8 +21,6 @@ #ifndef __ASM_ARCH_IO_H #define __ASM_ARCH_IO_H -#include <asm/io.h> - #define IO_SPACE_LIMIT 0xFFFFFFFF #define __io(a) ((void __iomem *)(a)) |