1 diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
2 index c34bdf8..818aba3 100644
3 --- a/drivers/macintosh/mediabay.c
4 +++ b/drivers/macintosh/mediabay.c
5 @@ -84,7 +84,7 @@ struct media_bay_info {
9 -#if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY)
10 +#if defined(CONFIG_BLK_DEV_IDE_PMAC)
14 @@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay)
18 +#ifdef CONFIG_BLK_DEV_IDE_PMAC
19 int check_media_bay(struct device_node *which_bay, int what)
22 @@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what)
24 EXPORT_SYMBOL(check_media_bay);
26 -#ifdef CONFIG_BLK_DEV_IDE_PMAC
27 int check_media_bay_by_base(unsigned long base, int what)
30 diff --git a/include/asm-powerpc/mediabay.h b/include/asm-powerpc/mediabay.h
31 index df111c3..b2efb33 100644
32 --- a/include/asm-powerpc/mediabay.h
33 +++ b/include/asm-powerpc/mediabay.h
35 #define MB_POWER 6 /* media bay contains a Power device (???) */
36 #define MB_NO 7 /* media bay contains nothing */
38 -int check_media_bay(struct device_node *which_bay, int what);
40 /* Number of bays in the machine or 0 */
41 extern int media_bay_count;
43 +#ifdef CONFIG_BLK_DEV_IDE_PMAC
44 +int check_media_bay(struct device_node *which_bay, int what);
46 int check_media_bay_by_base(unsigned long base, int what);
47 /* called by IDE PMAC host driver to register IDE controller for media bay */
48 int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base,
53 +static inline int check_media_bay(struct device_node *which_bay, int what)
60 #endif /* __KERNEL__ */
61 #endif /* _PPC_MEDIABAY_H */