Here's a patch to mediabay.c that got broke in pre7.
Brad Douglas
brad@neruo.com
http://www.linux-fbdev.org
--- v2.3.99-pre7-4/drivers/macintosh/mediabay.c Wed Feb 9 22:43:53 2000
+++ linux/drivers/macintosh/mediabay.c Fri May 5 10:23:20 2000
@@ -252,7 +252,7 @@
MBDBG("mediabay%d: powering up\n", which);
} else {
feature_clear(mb->dev_node, FEATURE_Mediabay_floppy_enable);
- feature_clear(mb->dev_node, FEATURE_Mediabay_IDE_enable);
+ feature_clear(mb->dev_node, FEATURE_IDE1_enable);
feature_clear(mb->dev_node, FEATURE_Mediabay_PCI_enable);
feature_clear(mb->dev_node, FEATURE_SWIM3_enable);
feature_clear(mb->dev_node, FEATURE_Mediabay_power);
@@ -271,9 +271,9 @@
switch (id) {
case MB_CD:
- feature_set(bay->dev_node, FEATURE_Mediabay_IDE_enable);
+ feature_set(bay->dev_node, FEATURE_IDE1_enable);
udelay(10);
- feature_set(bay->dev_node, FEATURE_Mediabay_IDE_reset);
+ feature_set(bay->dev_node, FEATURE_IDE1_reset);
printk(KERN_INFO "media bay %d contains a CD-ROM drive\n", which);
break;
case MB_FD:
@@ -397,7 +397,7 @@
}
#ifdef CONFIG_BLK_DEV_IDE
MBDBG("mediabay%d: waiting IDE reset (kind:%d)\n", i, bay->content_id);
- feature_clear(bay->dev_node, FEATURE_Mediabay_IDE_reset);
+ feature_clear(bay->dev_node, FEATURE_IDE1_reset);
bay->timer = MS_TO_HZ(MB_IDE_WAIT);
bay->state = mb_ide_resetting;
#else
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun May 07 2000 - 21:00:15 EST