Merge bk://kernel.bkbits.net/wesolows/sparc32-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

Merge bk://kernel.bkbits.net/wesolows/sparc32-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
558dadec · David S. Miller · c28bcf3b · 60894153 · 558dadec · 558dadec
Commit 558dadec authored Mar 14, 2004 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/net/8139too.c drivers/net/8139too.c +1 -0

drivers/net/eepro100.c drivers/net/eepro100.c +1 -0

drivers/net/pcnet32.c drivers/net/pcnet32.c +1 -0

No files found.
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -113,6 +113,7 @@
 #include <linux/suspend.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/irq.h>
 #define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION
 #define PFX DRV_NAME ": "

--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -113,6 +113,7 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/irq.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>

--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -51,6 +51,7 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/irq.h>
 /*
 * PCI device identifiers for "new style" Linux PCI Device Drivers