diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 15:57:23 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 15:57:32 +1000 |
commit | 7bfb40b048aa709bb88a00a1acbadbd9f7a645ee (patch) | |
tree | 88cfef3d3facca564ad378553a838789e0c78cb1 /arch/arm/mach-footbridge/Kconfig | |
parent | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (diff) | |
parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) |
Merge remote-tracking branch 'origin/master' into next
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)
Diffstat (limited to 'arch/arm/mach-footbridge/Kconfig')
-rw-r--r-- | arch/arm/mach-footbridge/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index dc26fff22cf..c8e7afcf14e 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -62,6 +62,7 @@ config ARCH_EBSA285_HOST config ARCH_NETWINDER bool "NetWinder" select CLKSRC_I8253 + select CLKEVT_I8253 select FOOTBRIDGE_HOST select ISA select ISA_DMA |