patch-2.2.0-pre6 linux/arch/ppc/kernel/mbx_setup.c

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

diff -u --recursive --new-file v2.2.0-pre5/linux/arch/ppc/kernel/mbx_setup.c linux/arch/ppc/kernel/mbx_setup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mbx_setup.c,v 1.4 1998/11/15 19:58:55 cort Exp $
+ * $Id: mbx_setup.c,v 1.5 1998/12/29 18:55:07 cort Exp $
  *
  *  linux/arch/ppc/kernel/setup.c
  *
@@ -59,18 +59,21 @@
 void __init powermac_init(void)
 {
 }
+
 void __init adbdev_init(void)
 {
 }
 
 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;
 
-	*p = 0;
-	*irq = 0;
-
-	if (base != 0)		/* Only map the first ATA flash drive */
-		return;
+	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)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov