---

yaml --- r: 251659 b: refs/heads/master c: 1dcb14d h: refs/heads/master i: 251657: 90afde9 251655: 16b8c0b v: v3
git-mirror · May 25, 2011 · e1891d8 · e1891d8
1 parent 29b213a
commit e1891d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5971d43ef76f4b73c58e2d893de9db487388c87
+refs/heads/master: 1dcb14d9e874d12bab9ceeba776b742f1682b0a6
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -292,6 +292,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
 	{PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1003)},
 	{PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC9100)},
 	{PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_TIGON3)},
+	{PCI_DEVICE(0x10cf, 0x11a2)}, /* Fujitsu 1000base-SX with BCM5703SKHB */
 	{}
 };