patch-2.1.132 linux/arch/ppc/kernel/mbx_setup.c

• Lines: 36
• Date: Mon Dec 21 08:37:20 1998
• Orig file: v2.1.131/linux/arch/ppc/kernel/mbx_setup.c
• Orig date: Fri May 8 23:14:44 1998

diff -u --recursive --new-file v2.1.131/linux/arch/ppc/kernel/mbx_setup.c linux/arch/ppc/kernel/mbx_setup.c
@@ -1,4 +1,6 @@
 /*
+ * $Id: mbx_setup.c,v 1.4 1998/11/15 19:58:55 cort Exp $
+ *
  *  linux/arch/ppc/kernel/setup.c
  *
  *  Copyright (C) 1995  Linus Torvalds
@@ -51,10 +53,17 @@
 extern char saved_command_line[256];
 
 extern unsigned long find_available_memory(void);
-extern void mbx_cpm_reset(uint);
+extern void m8xx_cpm_reset(uint);
 
+/* this really does make things cleaner -- Cort */
+void __init powermac_init(void)
+{
+}
+void __init adbdev_init(void)
+{
+}
 
-void mbx_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq)
+void __init mbx_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq)
 {
 
 	*p = 0;
@@ -88,7 +97,7 @@
 
 	/* Reset the Communication Processor Module.
 	*/
-	mbx_cpm_reset(cpm_page);
+	m8xx_cpm_reset(cpm_page);
 
 #ifdef notdef
 	ROOT_DEV = to_kdev_t(0x0301); /* hda1 */