From e1891d84b734e725928e8284e12144777414043f Mon Sep 17 00:00:00 2001
From: Meelis Roos <mroos@ut.ee>
Date: Wed, 25 May 2011 05:43:47 +0000
Subject: [PATCH] --- yaml --- r: 251659 b: refs/heads/master c:
 1dcb14d9e874d12bab9ceeba776b742f1682b0a6 h: refs/heads/master i:   251657:
 90afde99afc6081cc3999f7a29cd1bd113fcc69e   251655:
 16b8c0b64e8c9f617ac29f2f363172fdb36f8b49 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6a3a51425832..27bcc80925e3 100644
--- 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
index db19332a7d87..f4b01c638a33 100644
--- 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 */
 	{}
 };