patch-2.1.100 linux/include/asm-m68k/ide.h

• Lines: 22
• Date: Wed May 6 14:42:54 1998
• Orig file: v2.1.99/linux/include/asm-m68k/ide.h
• Orig date: Thu Mar 26 15:57:05 1998

diff -u --recursive --new-file v2.1.99/linux/include/asm-m68k/ide.h linux/include/asm-m68k/ide.h
@@ -424,17 +424,17 @@
  * works. (Roman)
  */
 #if defined(CONFIG_ATARI) && !defined(CONFIG_AMIGA)
-#define	ide_sti()					\
+#define	ide__sti()					\
     do {						\
-	if (!in_interrupt()) sti();			\
+	if (!in_interrupt()) __sti();			\
     } while(0)
 #elif defined(CONFIG_ATARI)
-#define	ide_sti()						\
+#define	ide__sti()						\
     do {							\
 	if (!MACH_IS_ATARI || !in_interrupt()) sti();		\
     } while(0)
 #else /* !defined(CONFIG_ATARI) */
-#define	ide_sti()	sti()
+#define	ide__sti()	__sti()
 #endif
 
 #endif /* __KERNEL__ */