From 41a83ab553aa50ee304c6293cddee659fa0d5af8 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 1 Dec 2005 06:44:55 -0500
Subject: [PATCH] --- yaml --- r: 21207 b: refs/heads/master c:
 3c13958620f08c8082a2694e51dec32592438388 h: refs/heads/master i:   21205:
 827fcc3d833fdff82509ca1ad6cc5e22be13f4b4   21203:
 313d9f03289d806e526ce35d4b85c1df46a5f517   21199:
 f01d7fa27c3610bfa93c263bcc53b66248d79af6 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/7990.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8caeb612ea4c..64fbad79e7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82729971e0f8ccf1f15567cc4f2c5389e0659eb2
+refs/heads/master: 3c13958620f08c8082a2694e51dec32592438388
diff --git a/trunk/drivers/net/7990.c b/trunk/drivers/net/7990.c
index 18b027e73f28..86633c5f1a4b 100644
--- a/trunk/drivers/net/7990.c
+++ b/trunk/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>