diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-15 06:55:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 05:38:54 -0400 |
commit | ba81f502e73cee92964af6c39eb8c8d7e44e38c1 (patch) | |
tree | 59dacf9fc80cec4f3c93779ea56da1c3a622ee46 | |
parent | 5936d1161ff503a1170722fe9b2d9ac4da700eef (diff) |
ARM: Versatile Express: add NO_IOPORT
On Versatile Express, the PCI Express buses are broken and unusable, so
we aren't going to support PCI/ISA IO cycles on this platform. Remove
the PCI/ISA IO inb et.al. support for this platform.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/io.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 385a3861a029..6b5f84887ce5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -313,6 +313,7 @@ config ARCH_VEXPRESS | |||
313 | select HAVE_CLK | 313 | select HAVE_CLK |
314 | select HAVE_PATA_PLATFORM | 314 | select HAVE_PATA_PLATFORM |
315 | select ICST | 315 | select ICST |
316 | select NO_IOPORT | ||
316 | select PLAT_VERSATILE | 317 | select PLAT_VERSATILE |
317 | select PLAT_VERSATILE_CLCD | 318 | select PLAT_VERSATILE_CLCD |
318 | help | 319 | help |
diff --git a/arch/arm/mach-vexpress/include/mach/io.h b/arch/arm/mach-vexpress/include/mach/io.h index 13522d86685e..0088cd388a84 100644 --- a/arch/arm/mach-vexpress/include/mach/io.h +++ b/arch/arm/mach-vexpress/include/mach/io.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef __ASM_ARM_ARCH_IO_H | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
21 | #define __ASM_ARM_ARCH_IO_H | 21 | #define __ASM_ARM_ARCH_IO_H |
22 | 22 | ||
23 | #define __io(a) __typesafe_io(a) | ||
24 | #define __mem_pci(a) (a) | 23 | #define __mem_pci(a) (a) |
25 | 24 | ||
26 | #endif | 25 | #endif |