include/asm-sparc{,64}/ide.h: Get IDE layer building again on Sparc.

diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index 07bb6650f34ca771e4eccba718cc1837bb3510c8..b2b585d3ca3579bcb089610c611a30d447e14ee9 100644 (file)
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -66,16 +66,24 @@ static __inline__ void ide_init_default_hwifs(void)
        for (index = 0; index < MAX_HWIFS; index++) {
                ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
                hw.irq = ide_default_irq(ide_default_io_base(index));
-               ide_register_hw(&hw);
+               ide_register_hw(&hw, NULL);
        }
 #endif
 }
 
-#undef  SUPPORT_SLOW_DATA_PORTS
-#define SUPPORT_SLOW_DATA_PORTS 0
+#define ide_request_irq(irq,hand,flg,dev,id)   request_irq((irq),(hand),(flg),(dev),(id))
+#define ide_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
+#define ide_check_region(from,extent)          check_region((from), (extent))
+#define ide_request_region(from,extent,name)   request_region((from), (extent), (name))
+#define ide_release_region(from,extent)                release_region((from), (extent))
 
-#undef  HD_DATA
-#define HD_DATA ((ide_ioreg_t)0)
+/*
+ * The following are not needed for the non-m68k ports
+ */
+#define ide_ack_intr(hwif)             (1)
+#define ide_fix_driveid(id)            do {} while (0)
+#define ide_release_lock(lock)         do {} while (0)
+#define ide_get_lock(lock, hdlr, data) do {} while (0)
 
 /* From m68k code... */
 

diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index d5672caf1628aee1045c94805dc8c6a7b36b2cb3..fd1d19740f4bd76e64560dba447b1e6316b91cc4 100644 (file)
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -62,16 +62,25 @@ static __inline__ void ide_init_default_hwifs(void)
        for (index = 0; index < MAX_HWIFS; index++) {
                ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
                hw.irq = ide_default_irq(ide_default_io_base(index));
-               ide_register_hw(&hw);
+               ide_register_hw(&hw, NULL);
        }
 #endif
 }
 
-#undef  SUPPORT_SLOW_DATA_PORTS
-#define SUPPORT_SLOW_DATA_PORTS 0
 
-#undef  HD_DATA
-#define HD_DATA ((ide_ioreg_t)0)
+#define ide_request_irq(irq,hand,flg,dev,id)   request_irq((irq),(hand),(flg),(dev),(id))
+#define ide_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
+#define ide_check_region(from,extent)          check_region((from), (extent))
+#define ide_request_region(from,extent,name)   request_region((from), (extent), (name))
+#define ide_release_region(from,extent)                release_region((from), (extent))
+
+/*
+ * The following are not needed for the non-m68k ports
+ */
+#define ide_ack_intr(hwif)             (1)
+#define ide_fix_driveid(id)            do {} while (0)
+#define ide_release_lock(lock)         do {} while (0)
+#define ide_get_lock(lock, hdlr, data) do {} while (0)
 
 /* From m68k code... */