Merge branch 'akpm' (second patch-bomb from Andrew)

[cascardo/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2160091..97d07ed 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -688,7 +688,9 @@ config ARCH_SA1100
        select CPU_SA1100
        select GENERIC_CLOCKEVENTS
        select HAVE_IDE
+       select IRQ_DOMAIN
        select ISA
+       select MULTI_IRQ_HANDLER
        select NEED_MACH_MEMORY_H
        select SPARSE_IRQ
        help