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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
net
/
pasemi_mac.h
diff --git
a/drivers/net/pasemi_mac.h
b/drivers/net/pasemi_mac.h
index
1a115ec
..
e2f4efa
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) */