From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 10 Dec 2006 10:20:50 +0000 (-0800)
Subject: [PATCH] MD: conditionalize some code
X-Git-Tag: v2.6.20-rc1~145^2~25
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdee8ae4498c48b44c0eac592f9c6ed24c4517c1;p=linux-2.6

[PATCH] MD: conditionalize some code

The autorun code is only used if this module is built into the static
kernel image.  Adjust #ifdefs accordingly.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 08c2d78e57..763ecab348 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3371,6 +3371,7 @@ out:
 	return err;
 }
 
+#ifndef MODULE
 static void autorun_array(mddev_t *mddev)
 {
 	mdk_rdev_t *rdev;
@@ -3485,6 +3486,7 @@ static void autorun_devices(int part)
 	}
 	printk(KERN_INFO "md: ... autorun DONE.\n");
 }
+#endif /* !MODULE */
 
 static int get_version(void __user * arg)
 {
@@ -5593,7 +5595,7 @@ static void autostart_arrays(int part)
 	autorun_devices(part);
 }
 
-#endif
+#endif /* !MODULE */
 
 static __exit void md_exit(void)
 {