git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
pasemi_mac.h
diff --git
a/drivers/net/pasemi_mac.h
b/drivers/net/pasemi_mac.h
index 1a115ec60b531d4bf407f406716fc8ccf9ac72f0..e2f4efa8ad46a5d79384a2afd6e441a1552f02a0 100644
(file)
--- a/
drivers/net/pasemi_mac.h
+++ b/
drivers/net/pasemi_mac.h
@@
-100,7
+100,6
@@
struct pasemi_mac {
int duplex;
unsigned int msg_enable;
- char phy_id[BUS_ID_SIZE];
};
/* Software status descriptor (ring_info) */