diff options
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/mediabay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index c34bdf852e32..818aba368541 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
@@ -84,7 +84,7 @@ struct media_bay_info { | |||
84 | int cd_irq; | 84 | int cd_irq; |
85 | int cd_retry; | 85 | int cd_retry; |
86 | #endif | 86 | #endif |
87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY) | 87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) |
88 | int cd_index; | 88 | int cd_index; |
89 | #endif | 89 | #endif |
90 | }; | 90 | }; |
@@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay) | |||
417 | } | 417 | } |
418 | } | 418 | } |
419 | 419 | ||
420 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
420 | int check_media_bay(struct device_node *which_bay, int what) | 421 | int check_media_bay(struct device_node *which_bay, int what) |
421 | { | 422 | { |
422 | int i; | 423 | int i; |
@@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what) | |||
432 | } | 433 | } |
433 | EXPORT_SYMBOL(check_media_bay); | 434 | EXPORT_SYMBOL(check_media_bay); |
434 | 435 | ||
435 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
436 | int check_media_bay_by_base(unsigned long base, int what) | 436 | int check_media_bay_by_base(unsigned long base, int what) |
437 | { | 437 | { |
438 | int i; | 438 | int i; |