diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 18:28:04 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 18:28:04 (GMT) |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/Kconfig | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
| download | linux-fsl-qoriq-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4344930..7275009 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -469,7 +469,7 @@ config ARCH_IXP4XX config ARCH_DOVE bool "Marvell Dove" - select CPU_V6K + select CPU_V7 select PCI select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS @@ -850,6 +850,7 @@ config ARCH_DAVINCI select HAVE_IDE select CLKDEV_LOOKUP select GENERIC_ALLOCATOR + select GENERIC_IRQ_CHIP select ARCH_HAS_HOLES_MEMORYMODEL help Support for TI's DaVinci platform. @@ -1027,6 +1028,7 @@ config PLAT_IOP config PLAT_ORION bool select CLKSRC_MMIO + select GENERIC_IRQ_CHIP select HAVE_SCHED_CLOCK config PLAT_PXA |