diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/net/netxen/netxen_nic_ethtool.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_ethtool.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index 4ad3e0844b99..b974ca0fc530 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 39 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 40 | #include <linux/ethtool.h> | 40 | #include <linux/ethtool.h> |
| 41 | #include <linux/version.h> | ||
| 42 | 41 | ||
| 43 | #include "netxen_nic.h" | 42 | #include "netxen_nic.h" |
| 44 | #include "netxen_nic_hw.h" | 43 | #include "netxen_nic_hw.h" |