Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 807b22dadcb682fa4467a98f125a26829db1f535..1947a09e5a3f04f4170d82a46a29a12b80bf81a1 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -31,6 +31,11 @@ config OLD_CLK_AT91
        bool
        default AT91_PMC_UNIT && AT91_USE_OLD_CLK
 
+config OLD_IRQ_AT91
+       bool
+       select MULTI_IRQ_HANDLER
+       select SPARSE_IRQ
+
 config AT91_SAM9_ALT_RESET
        bool
        default !ARCH_AT91X40
@@ -51,18 +56,16 @@ config HAVE_AT91_H32MX
 config SOC_AT91SAM9
        bool
        select AT91_SAM9_TIME
+       select ATMEL_AIC_IRQ if !OLD_IRQ_AT91
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
 
 config SOC_SAMA5
        bool
        select AT91_SAM9_TIME
+       select ATMEL_AIC5_IRQ
        select CPU_V7
        select GENERIC_CLOCKEVENTS
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
        select USE_OF
 
 menu "Atmel AT91 System-on-Chip"
@@ -76,8 +79,7 @@ config ARCH_AT91X40
        depends on !MMU
        select CPU_ARM7TDMI
        select ARCH_USES_GETTIMEOFFSET
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
+       select OLD_IRQ_AT91
 
        help
          Select this if you are using one of Atmel's AT91X40 SoC.
@@ -129,11 +131,10 @@ endif
 if SOC_SAM_V4_V5
 config SOC_AT91RM9200
        bool "AT91RM9200"
+       select ATMEL_AIC_IRQ if !OLD_IRQ_AT91
        select CPU_ARM920T
        select GENERIC_CLOCKEVENTS
        select HAVE_AT91_DBGU0
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
        select HAVE_AT91_USB_CLK
 
 config SOC_AT91SAM9260