patch-2.4.1 linux/arch/ppc/kernel/m8xx_setup.c

• Lines: 60
• Date: Mon Jan 22 15:41:15 2001
• Orig file: v2.4.0/linux/arch/ppc/kernel/m8xx_setup.c
• Orig date: Sun Sep 17 09:48:07 2000

diff -u --recursive --new-file v2.4.0/linux/arch/ppc/kernel/m8xx_setup.c linux/arch/ppc/kernel/m8xx_setup.c
@@ -63,8 +63,6 @@
 extern void mackbd_init_hw(void);
 #endif
 
-extern unsigned long loops_per_sec;
-
 unsigned char __res[sizeof(bd_t)];
 unsigned long empty_zero_page[1024];
 
@@ -344,25 +342,6 @@
 }
 
 int
-m8xx_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
-        return 0;
-}
-
-void
-m8xx_ide_request_region(ide_ioreg_t from,
-			unsigned int extent,
-			const char *name)
-{
-}
-
-void
-m8xx_ide_release_region(ide_ioreg_t from,
-			unsigned int extent)
-{
-}
-
-int
 m8xx_ide_request_irq(unsigned int irq,
 		       void (*handler)(int, void *, struct pt_regs *),
 		       unsigned long flags, 
@@ -376,12 +355,6 @@
 #endif
 }
 
-void
-m8xx_ide_fix_driveid(struct hd_driveid *id)
-{
-        ppc_generic_ide_fix_driveid(id);
-}
-
 /* We can use an external IDE controller or wire the IDE interface to
  * the internal PCMCIA controller.
  */
@@ -515,10 +488,7 @@
         ppc_ide_md.outsw = m8xx_ide_outsw;
         ppc_ide_md.default_irq = m8xx_ide_default_irq;
         ppc_ide_md.default_io_base = m8xx_ide_default_io_base;
-        ppc_ide_md.check_region = m8xx_ide_check_region;
-        ppc_ide_md.request_region = m8xx_ide_request_region;
-        ppc_ide_md.release_region = m8xx_ide_release_region;
-        ppc_ide_md.fix_driveid = m8xx_ide_fix_driveid;
+        ppc_ide_md.fix_driveid = ppc_generic_ide_fix_driveid;
         ppc_ide_md.ide_init_hwif = m8xx_ide_init_hwif_ports;
         ppc_ide_md.ide_request_irq = m8xx_ide_request_irq;