diff options
| author | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /drivers/net/igb/e1000_hw.h | |
| parent | Update selinux info in MAINTAINERS and Kconfig help text (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz linux-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
| -rw-r--r-- | drivers/net/igb/e1000_hw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index a65ccc3095c3..99504a600a80 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h @@ -41,7 +41,6 @@ struct e1000_hw; #define E1000_DEV_ID_82576 0x10C9 #define E1000_DEV_ID_82576_FIBER 0x10E6 #define E1000_DEV_ID_82576_SERDES 0x10E7 -#define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8 #define E1000_DEV_ID_82575EB_COPPER 0x10A7 #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 |