Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[~andy/linux] / kernel / irq / dummychip.c

diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c
index 918dea9de9eab863b2cbf113898a500cceb2429a..20dc5474947e5fafbefe4cd2eb5f3ac241403711 100644 (file)
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -31,7 +31,7 @@ static unsigned int noop_ret(struct irq_data *data)
        return 0;
 }
 
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_CRUFT
+#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
 static void compat_noop(unsigned int irq) { }
 #define END_INIT .end = compat_noop
 #else