Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

[safe/jmp/linux-2.6] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 60f8bc7..6c5d4c8 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <linux/smp.h>
 
-#if !defined(CONFIG_ARCH_S390)
+#if !defined(CONFIG_S390)
 
 #include <linux/linkage.h>
 #include <linux/cache.h>