diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
commit | 7c7145f6acc68100dbdc5d3c5c64fe3af1c99c89 (patch) | |
tree | 5e93e3eb4787229032f1df222fa490112f4b0c32 /drivers/net/hamachi.c | |
parent | 92d6b71ab906be706f3679353b30a8d2c3831144 (diff) | |
parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) |
Merge branch 'linus' into irq/core
Reason: Get the upstream IRQF_DISABLED related changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r-- | drivers/net/hamachi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 373546dd083..5d6f1387959 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
@@ -153,7 +153,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
153 | #include <linux/time.h> | 153 | #include <linux/time.h> |
154 | #include <linux/errno.h> | 154 | #include <linux/errno.h> |
155 | #include <linux/ioport.h> | 155 | #include <linux/ioport.h> |
156 | #include <linux/slab.h> | ||
157 | #include <linux/interrupt.h> | 156 | #include <linux/interrupt.h> |
158 | #include <linux/pci.h> | 157 | #include <linux/pci.h> |
159 | #include <linux/init.h> | 158 | #include <linux/init.h> |