--- linux-2.6.8-gentoo-r3/drivers/ide/ppc/pmac.c.orig	2004-11-05 01:04:39.651972816 +0000
+++ linux-2.6.8-gentoo-r3/drivers/ide/ppc/pmac.c	2004-11-05 01:04:42.468944088 +0000
@@ -1538,6 +1538,7 @@
 	{ PCI_VENDOR_ID_APPLE, PCI_DEVIEC_ID_APPLE_UNI_N_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 };
 
 static struct pci_driver pmac_ide_pci_driver = {
--- linux-2.6.8-gentoo-r3/drivers/net/sungem.c.orig	2004-11-05 01:03:56.049944392 +0000
+++ linux-2.6.8-gentoo-r3/drivers/net/sungem.c	2004-11-05 01:03:58.883912776 +0000
@@ -106,6 +106,8 @@
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
 	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_GMAC,
 	  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 },
 	{0, }
 };
 
--- linux-2.6.8-gentoo-r3/drivers/pci/pci.ids.orig	2004-11-05 01:06:13.203997744 +0000
+++ linux-2.6.8-gentoo-r3/drivers/pci/pci.ids	2004-11-05 01:42:16.142890280 +0000
@@ -2119,6 +2119,12 @@
 	0049  K2 HT-PCI Bridge
 	004b  U3 AGP
 	004c  K2 GMAC (Sun GEM)
+	0050  Shasta IDE
+	0051  Shasta (Sun GEM)
+	0052  Shasta Firewire
+	0053  Shasta PCI Bridge
+	0054  Shasta PCI Bridge
+	0055  Shasta PCI Bridge
 	1645  Tigon3 Gigabit Ethernet NIC (BCM5701)
 106c  Hyundai Electronics America
 	8801  Dual Pentium ISA/PCI Motherboard
--- linux-2.6.8-gentoo-r3/include/linux/pci_ids.h.orig	2004-11-05 00:56:44.044976616 +0000
+++ linux-2.6.8-gentoo-r3/include/linux/pci_ids.h	2004-11-05 01:28:38.325999264 +0000
@@ -835,6 +835,9 @@
 #define PCI_DEVICE_ID_APPLE_KEYLARGO_I	0x003e
 #define PCI_DEVICE_ID_APPLE_K2_ATA100	0x0043
 #define PCI_DEVICE_ID_APPLE_K2_GMAC	0x004c
+#define PCI_DEVICE_ID_APPLE_SH_ATA      0x0050
+#define PCI_DEVICE_ID_APPLE_SH_SUNGEM   0x0051
+#define PCI_DEVICE_ID_APPLE_SH_FW       0x0052
 #define PCI_DEVICE_ID_APPLE_TIGON3	0x1645
 
 #define PCI_VENDOR_ID_YAMAHA		0x1073