projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] sata_svw: trivial iomem annotations
[powerpc.git]
/
drivers
/
net
/
es3210.c
diff --git
a/drivers/net/es3210.c
b/drivers/net/es3210.c
index
6b0ab1e
..
822e5bf
100644
(file)
--- a/
drivers/net/es3210.c
+++ b/
drivers/net/es3210.c
@@
-375,7
+375,7
@@
static void es_block_input(struct net_device *dev, int count, struct sk_buff *sk
memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
} else {
/* Packet is in one chunk. */
memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
} else {
/* Packet is in one chunk. */
-
eth_io_copy_and_sum(skb, xfer_start, count, 0
);
+
memcpy_fromio(skb->data, xfer_start, count
);
}
}
}
}
@@
-421,8
+421,7
@@
MODULE_PARM_DESC(mem, "memory base address(es)");
MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver");
MODULE_LICENSE("GPL");
-int
-init_module(void)
+int __init init_module(void)
{
struct net_device *dev;
int this_dev, found = 0;
{
struct net_device *dev;
int this_dev, found = 0;
@@
-456,7
+455,7
@@
static void cleanup_card(struct net_device *dev)
iounmap(ei_status.mem);
}
iounmap(ei_status.mem);
}
-void
+void
__exit
cleanup_module(void)
{
int this_dev;
cleanup_module(void)
{
int this_dev;