diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /drivers/net/sungem.c | |
| parent | 68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff) | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| download | blackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.gz blackbird-op-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index de399563a9db..081717d01374 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -128,6 +128,8 @@ static struct pci_device_id gem_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, {0, } }; |
