fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-m68k / ide.h

diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h
index 063bb84..f9ffb2c 100644 (file)
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
- 
+
 /* Copyright(c) 1996 Kars de Jong */
 /* Based on the ide driver from 1.2.13pl8 */
 
@@ -31,7 +31,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #include <asm/setup.h>
 #include <asm/io.h>
@@ -50,32 +49,6 @@
 #define MAX_HWIFS      4       /* same as the other archs */
 #endif
 
-
-static __inline__ int ide_default_irq(unsigned long base)
-{
-         return 0;
-}
-
-static __inline__ unsigned long ide_default_io_base(int index)
-{
-          return 0;
-}
-
-
-/*
- * Set up a hw structure for a specified data port, control port and IRQ.
- * This should follow whatever the default interface uses.
- */
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw,
-                                          unsigned long data_port,
-                                          unsigned long ctrl_port, int *irq)
-{
-       if (data_port || ctrl_port)
-               printk("ide_init_hwif_ports: must not be called\n");
-}
-
-#define ide_init_default_irq(base)     (0)
-
 /*
  * Get rid of defs from io.h - ide has its private and conflicting versions
  * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we
@@ -150,7 +123,7 @@ static __inline__ void ide_release_lock (void)
 }
 
 static __inline__ void
-ide_get_lock(irqreturn_t (*handler)(int, void *, struct pt_regs *), void *data)
+ide_get_lock(irq_handler_t handler, void *data)
 {
        if (MACH_IS_ATARI) {
                if (falconide_intr_lock == 0) {