git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
drivers
/
net
/
a2065.c
diff --git
a/drivers/net/a2065.c
b/drivers/net/a2065.c
index
ce0a0b8
..
f142cc2
100644
(file)
--- a/
drivers/net/a2065.c
+++ b/
drivers/net/a2065.c
@@
-525,7
+525,7
@@
static inline int lance_reset (struct net_device *dev)
load_csrs (lp);
lance_init_ring (dev);
load_csrs (lp);
lance_init_ring (dev);
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
netif_start_queue(dev);
status = init_restart_lance (lp);
netif_start_queue(dev);
status = init_restart_lance (lp);
@@
-588,7
+588,6
@@
static netdev_tx_t lance_start_xmit (struct sk_buff *skb,
/* Kick the lance: transmit now */
ll->rdp = LE_C0_INEA | LE_C0_TDMD;
/* Kick the lance: transmit now */
ll->rdp = LE_C0_INEA | LE_C0_TDMD;
- dev->trans_start = jiffies;
dev_kfree_skb (skb);
local_irq_restore(flags);
dev_kfree_skb (skb);
local_irq_restore(flags);
@@
-628,7
+627,6
@@
static void lance_load_multicast (struct net_device *dev)
crc = crc >> 26;
mcast_table [crc >> 4] |= 1 << (crc & 0xf);
}
crc = crc >> 26;
mcast_table [crc >> 4] |= 1 << (crc & 0xf);
}
- return;
}
static void lance_set_multicast (struct net_device *dev)
}
static void lance_set_multicast (struct net_device *dev)
@@
-674,6
+672,7
@@
static struct zorro_device_id a2065_zorro_tbl[] __devinitdata = {
{ ZORRO_PROD_AMERISTAR_A2065 },
{ 0 }
};
{ ZORRO_PROD_AMERISTAR_A2065 },
{ 0 }
};
+MODULE_DEVICE_TABLE(zorro, a2065_zorro_tbl);
static struct zorro_driver a2065_driver = {
.name = "a2065",
static struct zorro_driver a2065_driver = {
.name = "a2065",