aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sungem.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2005-11-13 16:06:48 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:13 -0800
commit7fce260a6bf75080ef61408504add5618f90e41b (patch)
tree358032ca46888df92641bd32d0b88d5d2a1213d2 /drivers/net/sungem.c
parent[PATCH] slab: remove alloc_pages() calls (diff)
downloadlinux-dev-7fce260a6bf75080ef61408504add5618f90e41b.tar.xz
linux-dev-7fce260a6bf75080ef61408504add5618f90e41b.zip
[PATCH] ppc: add support for new powerbooks
Enablement patch for the new PowerBooks (late 2005 edition). This enables the ATA controller, Gigabit ethernet and basic AGP setup. Bluetooth works out-of-the box after running hid2hci. Still remaining is to get the touchpad to work, the simple change of just adding the new USB ids isn't enough. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r--drivers/net/sungem.c2
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, }
};