diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
| commit | 2011a067281565494494aee194ca5081e52d6c3f (patch) | |
| tree | e0b21ad43e6eeb0c67945026be71d1278c93c695 /arch/arm/common/Kconfig | |
| parent | 63fb70859f987f2b3b8028fa467fd63336315e9c (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'arch/arm/common/Kconfig')
| -rw-r--r-- | arch/arm/common/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 2e32acca02f..86b5e698266 100644 --- a/arch/arm/common/Kconfig +++ b/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 |