Commit 2ebda63b authored by Tony Breeds's avatar Tony Breeds Committed by Linus Torvalds
Browse files

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: default avatarTony Breeds <tony@bakeyournoodle.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e760e716

drivers/block/swim3.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

drivers/macintosh/mediabay.c

+0 −2
Original line number Diff line number Diff line
@@ -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)