Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv17985/drivers/net/tulip
Modified Files:
eeprom.c tulip_core.c
Log Message:
Removal of files duplicated in Linus tree.
Index: eeprom.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/eeprom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- eeprom.c 2001/10/22 18:20:56 1.2
+++ eeprom.c 2001/11/06 20:23:55 1.3
@@ -100,7 +100,6 @@
static unsigned char *last_ee_data;
static int controller_index;
struct tulip_private *tp = (struct tulip_private *)dev->priv;
- long ioaddr = dev->base_addr;
unsigned char *ee_data = tp->eeprom;
int i;
@@ -112,7 +111,7 @@
* to see if the current device is not in the PCI slot.
* PCI cards fend for themselves, otherwise we kludge.
*/
- if(ioaddr != 0x10108000) { /* not PCI slot */
+ if (dev->base_addr != 0x10108000) { /* not PCI slot */
ee_data[19] = 1; /* set One controller... TJS */
i = 8; /* make us fall into the right code */
}
Index: tulip_core.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tulip_core.c 2001/11/06 09:10:22 1.10
+++ tulip_core.c 2001/11/06 20:23:55 1.11
@@ -246,7 +246,6 @@
static struct net_device_stats *tulip_get_stats(struct net_device *dev);
static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static void set_rx_mode(struct net_device *dev);
-
#ifdef CONFIG_COBALT_27
static int tulip_linkcheck(void *cookie);
#endif
|
