The patch titled Fix compile of swim3 as module has been added to the -mm tree. Its filename is fix-compile-of-swim3-as-module.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Fix compile of swim3 as module From: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx> The current pmac32_defconfig fails to build with the following error: Building modules, stage 2. ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined! WARNING: modpost: Found 23 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' make[2]: *** [__modpost] Error 1 This patch fixes that. Signed-off-by: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx> Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Cc: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/swim3.c | 4 ---- drivers/macintosh/mediabay.c | 2 -- 2 files changed, 6 deletions(-) diff -puN drivers/block/swim3.c~fix-compile-of-swim3-as-module drivers/block/swim3.c --- a/drivers/block/swim3.c~fix-compile-of-swim3-as-module +++ a/drivers/block/swim3.c @@ -251,10 +251,6 @@ static int floppy_release(struct inode * static int floppy_check_change(struct gendisk *disk); static int floppy_revalidate(struct gendisk *disk); -#ifndef CONFIG_PMAC_MEDIABAY -#define check_media_bay(which, what) 1 -#endif - static void swim3_select(struct floppy_state *fs, int sel) { struct swim3 __iomem *sw = fs->swim3; diff -puN drivers/macintosh/mediabay.c~fix-compile-of-swim3-as-module drivers/macintosh/mediabay.c --- a/drivers/macintosh/mediabay.c~fix-compile-of-swim3-as-module +++ a/drivers/macintosh/mediabay.c @@ -417,7 +417,6 @@ static void poll_media_bay(struct media_ } } -#ifdef CONFIG_MAC_FLOPPY int check_media_bay(struct device_node *which_bay, int what) { int i; @@ -432,7 +431,6 @@ int check_media_bay(struct device_node * return -ENODEV; } EXPORT_SYMBOL(check_media_bay); -#endif /* CONFIG_MAC_FLOPPY */ #ifdef CONFIG_BLK_DEV_IDE_PMAC int check_media_bay_by_base(unsigned long base, int what) _ Patches currently in -mm which might be from tony@xxxxxxxxxxxxxxxxxx are xc5000-fix-build-error-when-built-as-module.patch fix-compile-of-swim3-as-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html