patch-2.1.113 linux/arch/m68k/amiga/amiints.c

• Lines: 19
• Date: Thu Jul 30 11:08:19 1998
• Orig file: v2.1.112/linux/arch/m68k/amiga/amiints.c
• Orig date: Tue Feb 17 13:12:44 1998

diff -u --recursive --new-file v2.1.112/linux/arch/m68k/amiga/amiints.c linux/arch/m68k/amiga/amiints.c
@@ -32,6 +32,7 @@
 #include <asm/traps.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
+#include <asm/amipcmcia.h>
 
 extern int cia_request_irq(struct ciabase *base,int irq,
                            void (*handler)(int, void *, struct pt_regs *),
@@ -88,6 +89,10 @@
 	}
 	for (i = 0; i < AMI_IRQS; i++)
 		ami_ablecount[i] = 0;
+
+	/* turn off PCMCIA interrupts */
+	if (AMIGAHW_PRESENT(PCMCIA))
+		pcmcia_disable_irq();
 
 	/* turn off all interrupts and enable the master interrupt bit */
 	custom.intena = 0x7fff;