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/tiwai/sound
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
marvell
/
sky2.h
diff --git
a/drivers/net/ethernet/marvell/sky2.h
b/drivers/net/ethernet/marvell/sky2.h
index
0af31b8
..
ff6f58b
100644
(file)
--- a/
drivers/net/ethernet/marvell/sky2.h
+++ b/
drivers/net/ethernet/marvell/sky2.h
@@
-2287,6
+2287,7
@@
struct sky2_hw {
#define SKY2_HW_RSS_BROKEN 0x00000100
#define SKY2_HW_VLAN_BROKEN 0x00000200
#define SKY2_HW_RSS_CHKSUM 0x00000400 /* RSS requires chksum */
+#define SKY2_HW_IRQ_SETUP 0x00000800
u8 chip_id;
u8 chip_rev;