aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-09 04:28:38 -0400
committerRusty Russell <rusty@rustcorp.com.au>2008-10-16 11:38:35 -0400
commita65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch)
tree2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/md/md.c
parent04ab591808565f968d4406f6435090ad671ebdab (diff)
remove CONFIG_KMOD from drivers
Straight forward conversions to CONFIG_MODULE; many drivers include <linux/kmod.h> conditionally and then don't have any other conditional code so remove it from those. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: video4linux-list@redhat.com Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-ppp@vger.kernel.org Cc: dm-devel@redhat.com Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0a3a4bdcd4af..3323d7647b48 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -44,14 +44,9 @@
44#include <linux/mutex.h> 44#include <linux/mutex.h>
45#include <linux/ctype.h> 45#include <linux/ctype.h>
46#include <linux/freezer.h> 46#include <linux/freezer.h>
47
48#include <linux/init.h> 47#include <linux/init.h>
49
50#include <linux/file.h> 48#include <linux/file.h>
51
52#ifdef CONFIG_KMOD
53#include <linux/kmod.h> 49#include <linux/kmod.h>
54#endif
55 50
56#include <asm/unaligned.h> 51#include <asm/unaligned.h>
57 52
@@ -3555,12 +3550,10 @@ static int do_md_run(mddev_t * mddev)
3555 } 3550 }
3556 } 3551 }
3557 3552
3558#ifdef CONFIG_KMOD
3559 if (mddev->level != LEVEL_NONE) 3553 if (mddev->level != LEVEL_NONE)
3560 request_module("md-level-%d", mddev->level); 3554 request_module("md-level-%d", mddev->level);
3561 else if (mddev->clevel[0]) 3555 else if (mddev->clevel[0])
3562 request_module("md-%s", mddev->clevel); 3556 request_module("md-%s", mddev->clevel);
3563#endif
3564 3557
3565 /* 3558 /*
3566 * Drop all container device buffers, from now on 3559 * Drop all container device buffers, from now on