patch-2.4.0-test12 linux/include/asm-m68k/amipcmcia.h

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

diff -u --recursive --new-file v2.4.0-test11/linux/include/asm-m68k/amipcmcia.h linux/include/asm-m68k/amipcmcia.h
@@ -36,17 +36,17 @@
 
 static inline void pcmcia_ack_int(u_char intreq)
 {
-	gayle.intreq = ((intreq & 0x2c) ^ 0x2c) | 0xc0;
+	gayle.intreq = 0xf8;
 }
 
 static inline void pcmcia_enable_irq(void)
 {
-	gayle.inten = GAYLE_IRQ_IDE|GAYLE_IRQ_IRQ;
+	gayle.inten |= GAYLE_IRQ_IRQ;
 }
 
 static inline void pcmcia_disable_irq(void)
 {
-	gayle.inten = GAYLE_IRQ_IDE;
+	gayle.inten &= ~GAYLE_IRQ_IRQ;
 }
 
 #define PCMCIA_INSERTED	(gayle.cardstatus & GAYLE_CS_CCDET)

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