Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d8a232 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  module: remove CONFIG_KMOD in comment after #endif
  remove CONFIG_KMOD from fs
  remove CONFIG_KMOD from drivers

Manually fix conflict due to include cleanups in drivers/md/md.c
parents e4856a70 118a9069

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");

drivers/media/video/v4l2-common.c

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ 
#include <media/v4l2-common.h>

#include <media/v4l2-chip-ident.h>



#ifdef CONFIG_KMOD

#include <linux/kmod.h>

#endif



#include <linux/videodev2.h>



MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");