git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git]
/
drivers
/
net
/
atari_pamsnet.c
diff --git
a/drivers/net/atari_pamsnet.c
b/drivers/net/atari_pamsnet.c
index
d6039e6
..
a102625
100644
(file)
--- a/
drivers/net/atari_pamsnet.c
+++ b/
drivers/net/atari_pamsnet.c
@@
-857,7
+857,7
@@
pamsnet_close(struct net_device *dev) {
/* Get the current statistics.
This may be called with the card open or closed.
*/
/* Get the current statistics.
This may be called with the card open or closed.
*/
-static struct net_device_stats *net_get_stats(struct net_device *dev)
+static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;