Commit:     2ebda63b09a4e2232effb7a37e609651fe221090
Parent:     e760e716d47b48caf98da348368fd41b4a9b9e7e
Author:     Tony Breeds <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 14 19:31:19 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 14 20:58:04 2008 -0800

    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[2]: *** [__modpost] Error 1
    This patch fixes that.
    Signed-off-by: Tony Breeds <[EMAIL PROTECTED]>
    Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Cc: Paul Mackerras <[EMAIL PROTECTED]>
    Acked-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
    Cc: Josh Boyer <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 
 static int floppy_check_change(struct gendisk *disk);
 static int floppy_revalidate(struct gendisk *disk);
-#define check_media_bay(which, what)   1
 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)
 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;
-#endif /* CONFIG_MAC_FLOPPY */
 int check_media_bay_by_base(unsigned long base, int what)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to