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/teigland/dlm
[pandora-kernel.git]
/
drivers
/
net
/
skge.h
diff --git
a/drivers/net/skge.h
b/drivers/net/skge.h
index
51c0214
..
598bf7a
100644
(file)
--- a/
drivers/net/skge.h
+++ b/
drivers/net/skge.h
@@
-2460,7
+2460,6
@@
struct skge_port {
struct timer_list link_timer;
enum pause_control flow_control;
enum pause_status flow_status;
struct timer_list link_timer;
enum pause_control flow_control;
enum pause_status flow_status;
- u8 rx_csum;
u8 blink_on;
u8 wol;
u8 autoneg; /* AUTONEG_ENABLE, AUTONEG_DISABLE */
u8 blink_on;
u8 wol;
u8 autoneg; /* AUTONEG_ENABLE, AUTONEG_DISABLE */