Commit a65e5d78 authored by Johannes Berg's avatar Johannes Berg Committed by Rusty Russell
Browse files

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: default avatarJohannes 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: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 04ab5918

drivers/md/md.c

+0 −7
Original line number Diff line number Diff line
@@ -44,14 +44,9 @@ 
#include <linux/mutex.h>

#include <linux/ctype.h>

#include <linux/freezer.h>



#include <linux/init.h>



#include <linux/file.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



#include <asm/unaligned.h>
@@ -3555,12 +3550,10 @@ static int do_md_run(mddev_t * mddev) 
		}

	}



#ifdef CONFIG_KMOD

	if (mddev->level != LEVEL_NONE)

		request_module("md-level-%d", mddev->level);

	else if (mddev->clevel[0])

		request_module("md-%s", mddev->clevel);

#endif



	/*

	 * Drop all container device buffers, from now on

drivers/media/video/cpia.c

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ 
#include <asm/io.h>

#include <linux/mutex.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



#include "cpia.h"



static int video_nr = -1;

drivers/media/video/usbvision/usbvision-core.c

+0 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ 


#include <linux/workqueue.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



#include "usbvision.h"



static unsigned int core_debug;

drivers/media/video/usbvision/usbvision-video.c

+0 −4
Original line number Diff line number Diff line
@@ -69,10 +69,6 @@ 


#include <linux/workqueue.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



#include "usbvision.h"

#include "usbvision-cards.h"

drivers/media/video/v4l1-compat.c

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ 
#include <asm/system.h>

#include <asm/pgtable.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



static unsigned int debug;

module_param(debug, int, 0644);

MODULE_PARM_DESC(debug, "enable debug messages");

CRA Git | Maintained and supported by SUSTech CRA and CCSE