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-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
include
/
linux
/
bfin_mac.h
diff --git
a/include/linux/bfin_mac.h
b/include/linux/bfin_mac.h
index
904dec7
..
a69554e
100644
(file)
--- a/
include/linux/bfin_mac.h
+++ b/
include/linux/bfin_mac.h
@@
-24,6
+24,7
@@
struct bfin_mii_bus_platform_data {
const unsigned short *mac_peripherals;
int phy_mode;
unsigned int phy_mask;
+ unsigned short vlan1_mask, vlan2_mask;
};
#endif