Pull video into release branch

[linux-2.6] / drivers / net / 7990.c

diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 18b027e73f28cc0bd3b28253baa80fdd5bb20b9e..86633c5f1a4b9c4d1e7f24aac46656ee995cb114 100644 (file)
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/skbuff.h>
-#include <linux/irq.h>
+#include <asm/irq.h>
 /* Used for the temporal inet entries and routing */
 #include <linux/socket.h>
 #include <linux/bitops.h>