diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
| commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
| tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-prima2/Kconfig | |
| parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
| parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) | |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-prima2/Kconfig')
| -rw-r--r-- | arch/arm/mach-prima2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 41fc85327673..558ccfb8d458 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -6,8 +6,8 @@ config ARCH_PRIMA2 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" default y select CPU_V7 - select ZONE_DMA select SIRF_IRQ + select ZONE_DMA help Support for CSR SiRFSoC ARM Cortex A9 Platform |