diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 14:56:33 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 14:56:33 +0100 |
commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /drivers/net/igb/igb_main.c | |
parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
download | kernel-crypto-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.gz kernel-crypto-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.xz kernel-crypto-85ae01b2da0ed606a2e8d840aadef90fd30220a1.zip |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 0ed25f059a0..45a0e4fd587 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -72,6 +72,7 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 }, |