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
[PATCH] skge: set mac address oops with bonding
[safe/jmp/linux-2.6]
/
drivers
/
net
/
bmac.c
diff --git
a/drivers/net/bmac.c
b/drivers/net/bmac.c
index
8dc657f
..
60dba4a
100644
(file)
--- a/
drivers/net/bmac.c
+++ b/
drivers/net/bmac.c
@@
-218,7
+218,7
@@
void bmwrite(struct net_device *dev, unsigned long reg_offset, unsigned data )
static inline
-
volatile
unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
+unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
{
return in_le16((void __iomem *)dev->base_addr + reg_offset);
}