lkml.org 
[lkml]   [2000]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] tulip hosed in pre3-3
On 20 Mar 2000, Michael Harnois wrote:

> --- drivers/net/tulip/tulip.h.orig Mon Mar 20 15:56:05 2000
> +++ drivers/net/tulip/tulip.h Mon Mar 20 15:54:53 2000
> @@ -17,6 +17,7 @@
> #include <linux/spinlock.h>
> #include <linux/netdevice.h>
> #include <linux/timer.h>
> +#include <asm/io.h>
>
> struct tulip_chip_table {
> char *chip_name;
>
> --
> Michael D. Harnois, Redeemer Lutheran Church, Washburn, IA
> mdharnois@home.com aa0bt@aa0bt.ampr.org
> Be radical, be as radical as you can ...
> because radicals empower liberals.
> --John Preston
>

If you do this, you might as well remove the #include <asm/io.h> from
files that #include "tulip.h". Unless there is a good reason to not do so?

Patch attached.

Paul Laufer
diff -urN linux-devel-virgin/drivers/net/tulip/21142.c linux/drivers/net/tulip/21142.c
--- linux-devel-virgin/drivers/net/tulip/21142.c Fri Feb 25 15:16:37 2000
+++ linux/drivers/net/tulip/21142.c Mon Mar 20 17:30:14 2000
@@ -14,7 +14,6 @@
*/

#include "tulip.h"
-#include <asm/io.h>


static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, };
diff -urN linux-devel-virgin/drivers/net/tulip/eeprom.c linux/drivers/net/tulip/eeprom.c
--- linux-devel-virgin/drivers/net/tulip/eeprom.c Mon Mar 20 17:17:37 2000
+++ linux/drivers/net/tulip/eeprom.c Mon Mar 20 17:30:31 2000
@@ -15,7 +15,6 @@

#include "tulip.h"
#include <linux/init.h>
-#include <asm/io.h>
#include <asm/unaligned.h>


diff -urN linux-devel-virgin/drivers/net/tulip/interrupt.c linux/drivers/net/tulip/interrupt.c
--- linux-devel-virgin/drivers/net/tulip/interrupt.c Mon Mar 20 17:17:37 2000
+++ linux/drivers/net/tulip/interrupt.c Mon Mar 20 17:30:44 2000
@@ -14,7 +14,6 @@
*/

#include "tulip.h"
-#include <asm/io.h>
#include <linux/etherdevice.h>
#include <linux/pci.h>

diff -urN linux-devel-virgin/drivers/net/tulip/media.c linux/drivers/net/tulip/media.c
--- linux-devel-virgin/drivers/net/tulip/media.c Fri Feb 25 15:16:37 2000
+++ linux/drivers/net/tulip/media.c Mon Mar 20 17:30:50 2000
@@ -14,7 +14,6 @@
*/

#include "tulip.h"
-#include <asm/io.h>


/* This is a mysterious value that can be written to CSR11 in the 21040 (only)
diff -urN linux-devel-virgin/drivers/net/tulip/pnic.c linux/drivers/net/tulip/pnic.c
--- linux-devel-virgin/drivers/net/tulip/pnic.c Fri Feb 25 15:16:37 2000
+++ linux/drivers/net/tulip/pnic.c Mon Mar 20 17:30:58 2000
@@ -15,7 +15,6 @@

#include <linux/kernel.h>
#include "tulip.h"
-#include <asm/io.h>


void pnic_do_nway(struct net_device *dev)
diff -urN linux-devel-virgin/drivers/net/tulip/timer.c linux/drivers/net/tulip/timer.c
--- linux-devel-virgin/drivers/net/tulip/timer.c Fri Feb 25 15:16:37 2000
+++ linux/drivers/net/tulip/timer.c Mon Mar 20 17:31:07 2000
@@ -14,7 +14,6 @@
*/

#include "tulip.h"
-#include <asm/io.h>


void tulip_timer(unsigned long data)
diff -urN linux-devel-virgin/drivers/net/tulip/tulip.h linux/drivers/net/tulip/tulip.h
--- linux-devel-virgin/drivers/net/tulip/tulip.h Mon Mar 20 17:17:37 2000
+++ linux/drivers/net/tulip/tulip.h Mon Mar 20 17:32:11 2000
@@ -17,7 +17,7 @@
#include <linux/spinlock.h>
#include <linux/netdevice.h>
#include <linux/timer.h>
-
+#include <asm/io.h>

struct tulip_chip_table {
char *chip_name;
diff -urN linux-devel-virgin/drivers/net/tulip/tulip_core.c linux/drivers/net/tulip/tulip_core.c
--- linux-devel-virgin/drivers/net/tulip/tulip_core.c Mon Mar 20 17:17:37 2000
+++ linux/drivers/net/tulip/tulip_core.c Mon Mar 20 17:29:52 2000
@@ -27,7 +27,6 @@
#include <linux/init.h>
#include <linux/etherdevice.h>
#include <linux/delay.h>
-#include <asm/io.h>
#include <asm/unaligned.h>

\
 
 \ /
  Last update: 2005-03-22 13:57    [from the cache]
©2003-2011 Jasper Spaans