patch-2.4.0-prerelease linux/include/asm-m68k/ide.h

Next file: linux/include/asm-m68k/idprom.h
Previous file: linux/include/asm-m68k/hardirq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/include/asm-m68k/ide.h linux/include/asm-m68k/ide.h
@@ -50,28 +50,21 @@
 #define MAX_HWIFS	4	/* same as the other archs */
 #endif
 
-int q40ide_default_irq(q40ide_ioreg_t);
 
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
-        if (MACH_IS_Q40)
-	      return q40ide_default_irq((q40ide_ioreg_t) base);
-	else return 0;
+	  return 0;
 }
 
-int q40ide_default_io_base(int);
-
 static __inline__ ide_ioreg_t ide_default_io_base(int index)
 {
-	if (MACH_IS_Q40)
-		return (ide_ioreg_t)q40ide_default_io_base(index);
-	else return 0;
+          return 0;
 }
 
 /*
  *  Can we do this in a generic manner??
  */
-void q40_ide_init_hwif_ports (hw_regs_t *hw, q40ide_ioreg_t data_port, q40ide_ioreg_t ctrl_port, int *irq);
+
 
 /*
  * Set up a hw structure for a specified data port, control port and IRQ.
@@ -79,10 +72,6 @@
  */
 static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
 {
-#ifdef CONFIG_Q40
-	if (MACH_IS_Q40)
-		return q40_ide_init_hwif_ports(hw, (q40ide_ioreg_t) data_port, (q40ide_ioreg_t) ctrl_port, irq);
-#endif
 	if (data_port || ctrl_port)
 		printk("ide_init_hwif_ports: must not be called\n");
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)