Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:57:55 +0000 (23:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:57:55 +0000 (23:57 +0100)
1  2  3 
arch/arm/Kconfig

diff --combined arch/arm/Kconfig
@@@@ -731,6 -731,7 -731,7 +731,6 @@@@ config ARCH_RP
        bool "RiscPC"
        select ARCH_ACORN
        select FIQ
 --     select TIMER_ACORN
        select ARCH_MAY_HAVE_PC_FDC
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
@@@@ -759,6 -760,6 -760,7 +759,7 @@@@ config ARCH_SA110
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_IDE
        select NEED_MACH_MEMORY_H
++      select SPARSE_IRQ
        help
          Support for StrongARM 11x0 based boards.