Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[~andy/linux] / kernel / irq / Kconfig

diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index a69c333f78e429314a3ca72dc8813ffa5c224555..d1d051b38e0b5fc1c84eb3bb94b85373d7d6bf47 100644 (file)
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -10,9 +10,6 @@ menu "IRQ subsystem"
 config GENERIC_HARDIRQS
        def_bool y
 
-config GENERIC_HARDIRQS_NO_COMPAT
-       bool
-
 # Options selectable by the architecture code
 
 # Make sparse irq Kconfig switch below available
@@ -51,6 +48,10 @@ config IRQ_PREFLOW_FASTEOI
 config IRQ_EDGE_EOI_HANDLER
        bool
 
+# Generic configurable interrupt chip implementation
+config GENERIC_IRQ_CHIP
+       bool
+
 # Support forced irq threading
 config IRQ_FORCED_THREADING
        bool