projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
net
/
ni65.c
diff --git
a/drivers/net/ni65.c
b/drivers/net/ni65.c
index
0976852
..
24e393b
100644
(file)
--- a/
drivers/net/ni65.c
+++ b/
drivers/net/ni65.c
@@
-183,7
+183,7
@@
static struct card {
short addr_offset;
unsigned char *vendor_id;
char *cardname;
- long config;
+
unsigned
long config;
} cards[] = {
{
.id0 = NI65_ID0,
@@
-1113,7
+1113,6
@@
static void ni65_recv_intr(struct net_device *dev,int csr0)
p->stats.rx_bytes += len;
skb->protocol=eth_type_trans(skb,dev);
netif_rx(skb);
- dev->last_rx = jiffies;
}
else
{