diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/common/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4853f9df37bd..6c73e963d976 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -354,7 +354,7 @@ config ARCH_IXP4XX | |||
354 | select GENERIC_GPIO | 354 | select GENERIC_GPIO |
355 | select GENERIC_TIME | 355 | select GENERIC_TIME |
356 | select GENERIC_CLOCKEVENTS | 356 | select GENERIC_CLOCKEVENTS |
357 | select ZONE_DMA if PCI | 357 | select DMABOUNCE if PCI |
358 | help | 358 | help |
359 | Support for Intel's IXP4XX (XScale) family of processors. | 359 | Support for Intel's IXP4XX (XScale) family of processors. |
360 | 360 | ||
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 2e32acca02fb..86b5e6982660 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
@@ -13,10 +13,10 @@ config ICST307 | |||
13 | config SA1111 | 13 | config SA1111 |
14 | bool | 14 | bool |
15 | select DMABOUNCE if !ARCH_PXA | 15 | select DMABOUNCE if !ARCH_PXA |
16 | select ZONE_DMA if !ARCH_PXA | ||
17 | 16 | ||
18 | config DMABOUNCE | 17 | config DMABOUNCE |
19 | bool | 18 | bool |
19 | select ZONE_DMA | ||
20 | 20 | ||
21 | config TIMER_ACORN | 21 | config TIMER_ACORN |
22 | bool | 22 | bool |
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index db8b5fe06c0d..2c5a02b8520e 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
@@ -167,11 +167,6 @@ config MACH_GTWX5715 | |||
167 | 167 | ||
168 | comment "IXP4xx Options" | 168 | comment "IXP4xx Options" |
169 | 169 | ||
170 | config DMABOUNCE | ||
171 | bool | ||
172 | default y | ||
173 | depends on PCI | ||
174 | |||
175 | config IXP4XX_INDIRECT_PCI | 170 | config IXP4XX_INDIRECT_PCI |
176 | bool "Use indirect PCI memory access" | 171 | bool "Use indirect PCI memory access" |
177 | depends on PCI | 172 | depends on PCI |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index f27f6b3d6e6f..f781873431f3 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -257,7 +257,6 @@ config MACH_ARMCORE | |||
257 | bool "CompuLab CM-X255/CM-X270 modules" | 257 | bool "CompuLab CM-X255/CM-X270 modules" |
258 | select PXA27x | 258 | select PXA27x |
259 | select IWMMXT | 259 | select IWMMXT |
260 | select ZONE_DMA if PCI | ||
261 | select PXA25x | 260 | select PXA25x |
262 | select PXA_SSP | 261 | select PXA_SSP |
263 | 262 | ||