patch-2.3.16 linux/drivers/macintosh/mediabay.c

• Lines: 19
• Date: Tue Aug 31 11:35:59 1999
• Orig file: v2.3.15/linux/drivers/macintosh/mediabay.c
• Orig date: Wed Aug 4 16:36:41 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/macintosh/mediabay.c linux/drivers/macintosh/mediabay.c
@@ -25,7 +25,7 @@
 #include <asm/io.h>
 #include <asm/feature.h>
 #include <asm/mediabay.h>
-#include <linux/init.h>
+#include <asm/init.h>
 
 
 #undef MB_USE_INTERRUPTS
@@ -64,8 +64,7 @@
 #ifdef CONFIG_BLK_DEV_IDE
 /* check the busy bit in the media-bay ide interface
    (assumes the media-bay contains an ide device) */
-#define MB_IDE_READY(i)	((in_8((volatile unsigned char *) \
-			       (media_bays[i].cd_base + 0x70)) & 0x80) == 0)
+#define MB_IDE_READY(i)	((inb(media_bays[i].cd_base + 0x70) & 0x80) == 0)
 #endif
 
 /*