patch-2.2.19 linux/arch/ppc/kernel/pmac_setup.c

Next file: linux/arch/ppc/kernel/ppc_ksyms.c
Previous file: linux/arch/ppc/kernel/openpic.c
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -449,6 +449,16 @@
 
 #ifdef CONFIG_BLK_DEV_IDE_PMAC
 
+void
+ide_pmac_init(void)
+{
+	if (_machine == _MACH_Pmac)
+		pmu_suspend();
+	ide_init();	
+	if (_machine == _MACH_Pmac)
+		pmu_resume();
+}
+
 extern kdev_t pmac_find_ide_boot(char *bootdevice, int n);
 
 __initfunc(kdev_t find_ide_boot(void))
@@ -657,6 +667,10 @@
 	ppc_md.set_rtc_time   = pmac_set_rtc_time;
 	ppc_md.get_rtc_time   = pmac_get_rtc_time;
 	ppc_md.calibrate_decr = pmac_calibrate_decr;
+
+	ppc_md.pci_dev_root_bridge	= pmac_pci_dev_root_bridge;
+	ppc_md.pci_dev_mem_base		= pmac_pci_dev_mem_base;
+	ppc_md.pci_dev_io_base		= pmac_pci_dev_io_base;
 
 #ifdef CONFIG_VT
 #ifdef CONFIG_MAC_KEYBOARD

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)