diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/macintosh/mediabay.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/macintosh/mediabay.c')
| -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 13ce064f4..30ecbd4e0 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -180,7 +180,7 @@ check_media_bay(struct device_node *which_bay, int what) { #ifdef CONFIG_BLK_DEV_IDE int i; - + for (i=0; i<media_bay_count; i++) if (which_bay == media_bays[i].dev_node) { @@ -196,9 +196,9 @@ check_media_bay(struct device_node *which_bay, int what) int check_media_bay_by_base(unsigned long base, int what) { +#ifdef CONFIG_BLK_DEV_IDE int i; -#ifdef CONFIG_BLK_DEV_IDE for (i=0; i<media_bay_count; i++) if (base == media_bays[i].cd_base) { @@ -216,9 +216,9 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, int irq, int index) { - int i; - #ifdef CONFIG_BLK_DEV_IDE + int i; + for (i=0; i<media_bay_count; i++) if (which_bay == media_bays[i].dev_node) { |