From 749c83bfe48641490ccdd8ff5a778949998fe2d4 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 17 Oct 2008 14:00:43 +0100 Subject: [PATCH] --- yaml --- r: 116811 b: refs/heads/master c: 485bdde78747f7ce2af164406c32db23e4688925 h: refs/heads/master i: 116809: 2c595abd59cce5a6b2072782f6f4c1b3a554e4f4 116807: 82fcc908a1d445022a2a52563f978830526fde00 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 2 +- trunk/arch/arm/common/Kconfig | 2 +- trunk/arch/arm/mach-ixp4xx/Kconfig | 5 ----- trunk/arch/arm/mach-pxa/Kconfig | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7701a1bdf66c..f8c0580a0c1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71a35d75661271d20ff0098817070f6545e90cbe +refs/heads/master: 485bdde78747f7ce2af164406c32db23e4688925 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 4853f9df37bd..6c73e963d976 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -354,7 +354,7 @@ config ARCH_IXP4XX select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS - select ZONE_DMA if PCI + select DMABOUNCE if PCI help Support for Intel's IXP4XX (XScale) family of processors. diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig index 2e32acca02fb..86b5e6982660 100644 --- a/trunk/arch/arm/common/Kconfig +++ b/trunk/arch/arm/common/Kconfig @@ -13,10 +13,10 @@ config ICST307 config SA1111 bool select DMABOUNCE if !ARCH_PXA - select ZONE_DMA if !ARCH_PXA config DMABOUNCE bool + select ZONE_DMA config TIMER_ACORN bool diff --git a/trunk/arch/arm/mach-ixp4xx/Kconfig b/trunk/arch/arm/mach-ixp4xx/Kconfig index db8b5fe06c0d..2c5a02b8520e 100644 --- a/trunk/arch/arm/mach-ixp4xx/Kconfig +++ b/trunk/arch/arm/mach-ixp4xx/Kconfig @@ -167,11 +167,6 @@ config MACH_GTWX5715 comment "IXP4xx Options" -config DMABOUNCE - bool - default y - depends on PCI - config IXP4XX_INDIRECT_PCI bool "Use indirect PCI memory access" depends on PCI diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index f27f6b3d6e6f..f781873431f3 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -257,7 +257,6 @@ config MACH_ARMCORE bool "CompuLab CM-X255/CM-X270 modules" select PXA27x select IWMMXT - select ZONE_DMA if PCI select PXA25x select PXA_SSP