Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / arch / m68k / include / asm / macintosh.h

diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index 12ebe43b008b511839eb5825e08ee16d3fb7adaf..682a1a2ff55f931ceeeac2f812d5254a75d1810b 100644 (file)
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -11,16 +11,10 @@
 extern void mac_reset(void);
 extern void mac_poweroff(void);
 extern void mac_init_IRQ(void);
-extern int mac_irq_pending(unsigned int);
+
 extern void mac_irq_enable(struct irq_data *data);
 extern void mac_irq_disable(struct irq_data *data);
 
-/*
- *     Floppy driver magic hook - probably shouldn't be here
- */
-
-extern void via1_set_head(int);
-
 /*
  *     Macintosh Table
  */
@@ -48,7 +42,7 @@ struct mac_model
 #define MAC_ADB_IOP            6
 
 #define MAC_VIA_II             1
-#define MAC_VIA_IIci           2
+#define MAC_VIA_IICI           2
 #define MAC_VIA_QUADRA         3
 
 #define MAC_SCSI_NONE          0