Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / interrupt.h

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 41f150a3d2dda5a2445b100d55c87a904834ccd8..9e0fefd7884a9e79f2b1a9455de06e4708305fb6 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -2,7 +2,6 @@
 #ifndef _LINUX_INTERRUPT_H
 #define _LINUX_INTERRUPT_H
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/bitops.h>
@@ -79,7 +78,7 @@ static inline void __deprecated save_flags(unsigned long *x)
 {
        local_save_flags(*x);
 }
-#define save_flags(x) save_flags(&x);
+#define save_flags(x) save_flags(&x)
 static inline void __deprecated restore_flags(unsigned long x)
 {
        local_irq_restore(x);
@@ -112,7 +111,7 @@ enum
        TIMER_SOFTIRQ,
        NET_TX_SOFTIRQ,
        NET_RX_SOFTIRQ,
-       SCSI_SOFTIRQ,
+       BLOCK_SOFTIRQ,
        TASKLET_SOFTIRQ
 };