summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-10 02:20:50 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-10 09:57:21 -0800
commitfdee8ae4498c48b44c0eac592f9c6ed24c4517c1 (patch)
tree9d77e7fec74adb9c3689f565dfcbf2890ab5ccbe /drivers
parentb875e531fc82db592d6093594593d5cafde0a1cd (diff)
downloadop-kernel-dev-fdee8ae4498c48b44c0eac592f9c6ed24c4517c1.zip
op-kernel-dev-fdee8ae4498c48b44c0eac592f9c6ed24c4517c1.tar.gz
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/md.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 08c2d78..763ecab 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)
{
OpenPOWER on IntegriCloud