summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/Kconfig
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-04-05 02:48:04 +0400
committerOlof Johansson <olof@lixom.net>2012-04-05 22:29:55 +0400
commit1ac02d795889d1828a66d4b3a3fd66492d1d7cf2 (patch)
treee77b927029ba0280754936c5a75941bfdfa8ec8d /arch/arm/mach-pxa/Kconfig
parent00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2 (diff)
downloadlinux-1ac02d795889d1828a66d4b3a3fd66492d1d7cf2.tar.xz
ARM: fix __io macro for PCMCIA
With commit c334bc1 (ARM: make mach/io.h include optional), PCMCIA was broken. PCMCIA depends on __io() returning a valid i/o address, and most ARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This needs a better fix with a fixed i/o address mapping, but for now we just restore things to the previous behavior. This fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled, but PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff, so it doesn't need an io.h. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Joachim Eastwood <joachim.eastwood@jotron.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Andrew Victor <linux@maxim.org.za> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Tested-by: Paul Parsons <lost.distance@yahoo.com> (pxa270) Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
-rw-r--r--arch/arm/mach-pxa/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 109ccd2a8885..fe2d1f80ef50 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -113,6 +113,7 @@ config MACH_ARMCORE
select IWMMXT
select PXA25x
select MIGHT_HAVE_PCI
+ select NEED_MACH_IO_H if PCI
config MACH_EM_X270
bool "CompuLab EM-x270 platform"