Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

[~shefty/rdma-dev.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 94422601ea5b2e6dfb57169ceb760fce8893c5fe..5098564d58799cc8c63e222003a6881a44c509af 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -738,7 +738,6 @@ config ARCH_RPC
        bool "RiscPC"
        select ARCH_ACORN
        select FIQ
        bool "RiscPC"
        select ARCH_ACORN
        select FIQ

-       select TIMER_ACORN

        select ARCH_MAY_HAVE_PC_FDC
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
        select ARCH_MAY_HAVE_PC_FDC
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API


@@ -767,6 +766,7 @@ config ARCH_SA1100
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_IDE
        select NEED_MACH_MEMORY_H
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_IDE
        select NEED_MACH_MEMORY_H

+       select SPARSE_IRQ

        help
          Support for StrongARM 11x0 based boards.
 
        help
          Support for StrongARM 11x0 based boards.