diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-04 22:54:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-04 22:54:50 +0200 |
| commit | 5a412ad7f4c95bb5b756aa12b52646e857e7c75d (patch) | |
| tree | cff969a08da663077938e41bdeaa43855e00d4d9 /drivers/net/ixgb/ixgb.h | |
| parent | ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit(). (diff) | |
| parent | ixgbe: Cleanup PCIe bus speed info (diff) | |
| download | linux-5a412ad7f4c95bb5b756aa12b52646e857e7c75d.tar.xz linux-5a412ad7f4c95bb5b756aa12b52646e857e7c75d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 8f3df044e81e..49e8408f05fc 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h @@ -157,9 +157,6 @@ struct ixgb_adapter { u16 link_duplex; struct work_struct tx_timeout_task; - struct timer_list blink_timer; - unsigned long led_status; - /* TX */ struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp; unsigned int restart_queue; |