summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/mbx_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel/mbx_setup.c')
-rw-r--r--arch/ppc/kernel/mbx_setup.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/arch/ppc/kernel/mbx_setup.c b/arch/ppc/kernel/mbx_setup.c
index 9d26e27d1..90647dcd9 100644
--- a/arch/ppc/kernel/mbx_setup.c
+++ b/arch/ppc/kernel/mbx_setup.c
@@ -1,4 +1,6 @@
/*
+ * $Id: mbx_setup.c,v 1.5 1998/12/29 18:55:07 cort Exp $
+ *
* linux/arch/ppc/kernel/setup.c
*
* Copyright (C) 1995 Linus Torvalds
@@ -51,17 +53,27 @@ extern int rd_image_start; /* starting block # of image */
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);
-void mbx_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq)
+/* this really does make things cleaner -- Cort */
+void __init powermac_init(void)
{
+}
- *p = 0;
- *irq = 0;
+void __init adbdev_init(void)
+{
+}
- if (base != 0) /* Only map the first ATA flash drive */
- return;
+void __init mbx_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq)
+{
+ ide_ioreg_t port = base;
+ int i = 8;
+
+ while (i--)
+ *p++ = port++;
+ *p++ = base + 0x206;
+ if (irq != NULL)
+ *irq = 0;
#ifdef ATA_FLASH
base = (unsigned long) ioremap(PCMCIA_MEM_ADDR, 0x200);
for (i = 0; i < 8; ++i)
@@ -88,7 +100,7 @@ mbx_setup_arch(unsigned long * memory_start_p, unsigned long * memory_end_p))
/* Reset the Communication Processor Module.
*/
- mbx_cpm_reset(cpm_page);
+ m8xx_cpm_reset(cpm_page);
#ifdef notdef
ROOT_DEV = to_kdev_t(0x0301); /* hda1 */