[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/kernel ppc4xx_setup.c,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/ppc/kernel

Modified Files:
	ppc4xx_setup.c 
Log Message:
Synced to 2.5.18

Index: ppc4xx_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc4xx_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ppc4xx_setup.c	16 May 2002 18:01:37 -0000	1.3
+++ ppc4xx_setup.c	25 May 2002 20:32:00 -0000	1.4
@@ -68,10 +68,6 @@
 extern void pckbd_leds(unsigned char leds);
 extern void pckbd_init_hw(void);
 
-extern int nonpci_ide_default_irq(ide_ioreg_t base);
-extern void nonpci_ide_init_hwif_ports(hw_regs_t * hw, ide_ioreg_t data_port,
-				       ide_ioreg_t ctrl_port, int *irq);
-
 extern void ppc4xx_wdt_heartbeat(void);
 extern int wdt_enable;
 extern unsigned long wdt_period;
@@ -376,11 +372,8 @@
 **     defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 */
 #ifdef CONFIG_IDE
-# if defined(CONFIG_PCI)
+# ifdef CONFIG_PCI
 	ppc_ide_md.ide_init_hwif = ppc4xx_ide_init_hwif_ports;
-# elif defined (CONFIG_DMA_NONPCI)	/* ON board IDE */
-	ppc_ide_md.default_irq = nonpci_ide_default_irq;
-	ppc_ide_md.ide_init_hwif = nonpci_ide_init_hwif_ports;
 # endif
 #endif
 	board_init();