Skip to content

Commit

Permalink
[ARM] dmabounce requires ZONE_DMA
Browse files Browse the repository at this point in the history 
Rather than having everything that needs DMABOUNCE also select
ZONE_DMA, arrange for DMABOUNCE to select it instead.  This is
far more sensible.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Oct 17, 2008
1 parent 71a35d7 commit 485bdde
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/common/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/mach-ixp4xx/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 485bdde

Please sign in to comment.