diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/macintosh | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index cc1b44d2c..439526804 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -252,7 +252,7 @@ set_mb_power(int which, int onoff) 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 @@ set_media_bay(int which, int id) 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 @@ media_bay_step(int i) } #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 |