Re: [PATCH] FIx compile of swim3 as module
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2008-02-13 03:34:35
On Wed, 2008-02-13 at 13:40 +1100, Tony Breeds wrote:
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
Bart, I told you I didn't want those ifdef's in mediabay ... they are just cluttering things and causing trouble.
This patch fixes that. Signed-off-by: Tony Breeds <redacted>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
quoted hunk ↗ jump to hunk
--- drivers/block/swim3.c | 4 ---- drivers/macintosh/mediabay.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-)diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index b4e462f..730ccea 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c@@ -251,10 +251,6 @@ static int floppy_release(struct inode *inode, struct file *filp); 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 --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 9367882..51a1128 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c@@ -416,7 +416,6 @@ static void poll_media_bay(struct media_bay_info* bay) } } -#ifdef CONFIG_MAC_FLOPPY int check_media_bay(struct device_node *which_bay, int what) { int i;@@ -431,7 +430,6 @@ int check_media_bay(struct device_node *which_bay, int what) 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)Yours Tony linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/ Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!