diff options
Diffstat (limited to 'include/asm-m68k/ide.h')
| -rw-r--r-- | include/asm-m68k/ide.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 0a0222ac5..a69ef5b18 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h @@ -424,17 +424,17 @@ static __inline__ void ide_get_lock (int *ide_lock, void (*handler)(int, void *, * 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__ */ |