Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Fix compile of swim3 as module

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@bakeyournoodle.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Tony Breeds and committed by
Linus Torvalds
2ebda63b e760e716

-6
-4
drivers/block/swim3.c
··· 251 251 static int floppy_check_change(struct gendisk *disk); 252 252 static int floppy_revalidate(struct gendisk *disk); 253 253 254 - #ifndef CONFIG_PMAC_MEDIABAY 255 - #define check_media_bay(which, what) 1 256 - #endif 257 - 258 254 static void swim3_select(struct floppy_state *fs, int sel) 259 255 { 260 256 struct swim3 __iomem *sw = fs->swim3;
-2
drivers/macintosh/mediabay.c
··· 416 416 } 417 417 } 418 418 419 - #ifdef CONFIG_MAC_FLOPPY 420 419 int check_media_bay(struct device_node *which_bay, int what) 421 420 { 422 421 int i; ··· 430 431 return -ENODEV; 431 432 } 432 433 EXPORT_SYMBOL(check_media_bay); 433 - #endif /* CONFIG_MAC_FLOPPY */ 434 434 435 435 #ifdef CONFIG_BLK_DEV_IDE_PMAC 436 436 int check_media_bay_by_base(unsigned long base, int what)