diff options
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/Kconfig | 2 | ||||
-rw-r--r-- | drivers/macintosh/mediabay.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 173cf55c64d0..3d906833948d 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
@@ -123,7 +123,7 @@ config PMAC_APM_EMU | |||
123 | 123 | ||
124 | config PMAC_MEDIABAY | 124 | config PMAC_MEDIABAY |
125 | bool "Support PowerBook hotswap media bay" | 125 | bool "Support PowerBook hotswap media bay" |
126 | depends on PPC_PMAC && PPC32 | 126 | depends on PPC_PMAC && PPC32 && BLOCK |
127 | help | 127 | help |
128 | This option adds support for older PowerBook's hotswap media bay | 128 | This option adds support for older PowerBook's hotswap media bay |
129 | that can contains batteries, floppy drives, or IDE devices. PCI | 129 | that can contains batteries, floppy drives, or IDE devices. PCI |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index d7e46d345d9e..029ad8ce8a7e 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
19 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/ide.h> | ||
22 | #include <linux/kthread.h> | 21 | #include <linux/kthread.h> |
23 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
24 | #include <asm/prom.h> | 23 | #include <asm/prom.h> |
@@ -447,6 +446,7 @@ int check_media_bay_by_base(unsigned long base, int what) | |||
447 | 446 | ||
448 | return -ENODEV; | 447 | return -ENODEV; |
449 | } | 448 | } |
449 | EXPORT_SYMBOL_GPL(check_media_bay_by_base); | ||
450 | 450 | ||
451 | int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, | 451 | int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, |
452 | int irq, ide_hwif_t *hwif) | 452 | int irq, ide_hwif_t *hwif) |
@@ -486,6 +486,7 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, | |||
486 | 486 | ||
487 | return -ENODEV; | 487 | return -ENODEV; |
488 | } | 488 | } |
489 | EXPORT_SYMBOL_GPL(media_bay_set_ide_infos); | ||
489 | #endif /* CONFIG_BLK_DEV_IDE_PMAC */ | 490 | #endif /* CONFIG_BLK_DEV_IDE_PMAC */ |
490 | 491 | ||
491 | static void media_bay_step(int i) | 492 | static void media_bay_step(int i) |