Name: Clean up #ifdefs around include kmod.h
Author: Rusty Russell
Status: Trivial

This patch removes the (gratuitous) #ifdef CONFIG_KMOD from around 
#include <linux/kmod.h> throughout the kernel.

Index: linux-2.6.10-rc2-bk9-Misc/fs/nls/nls_base.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/fs/nls/nls_base.c	2004-01-10 13:59:32.000000000 +1100
+++ linux-2.6.10-rc2-bk9-Misc/fs/nls/nls_base.c	2004-11-27 14:49:51.096953744 +1100
@@ -14,9 +14,7 @@
 #include <linux/nls.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/spinlock.h>
 
 static struct nls_table default_table;
Index: linux-2.6.10-rc2-bk9-Misc/drivers/video/fbmem.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/video/fbmem.c	2004-11-26 11:37:03.000000000 +1100
+++ linux-2.6.10-rc2-bk9-Misc/drivers/video/fbmem.c	2004-11-27 14:52:24.791588608 +1100
@@ -28,9 +28,7 @@
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
 #include <linux/console.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/devfs_fs_kernel.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
Index: linux-2.6.10-rc2-bk9-Misc/drivers/media/video/cpia.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/media/video/cpia.c	2004-11-16 15:29:27.000000000 +1100
+++ linux-2.6.10-rc2-bk9-Misc/drivers/media/video/cpia.c	2004-11-27 14:52:24.790588760 +1100
@@ -41,10 +41,6 @@
 #include <asm/io.h>
 #include <asm/semaphore.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 #include "cpia.h"
 
 #ifdef CONFIG_VIDEO_CPIA_PP
Index: linux-2.6.10-rc2-bk9-Misc/drivers/char/ftape/zftape/zftape-init.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/char/ftape/zftape/zftape-init.c	2004-09-28 16:22:04.000000000 +1000
+++ linux-2.6.10-rc2-bk9-Misc/drivers/char/ftape/zftape/zftape-init.c	2004-11-27 14:49:50.970972896 +1100
@@ -29,9 +29,7 @@
 #include <linux/signal.h>
 #include <linux/major.h>
 #include <linux/slab.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h>
Index: linux-2.6.10-rc2-bk9-Misc/arch/sparc64/kernel/traps.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/arch/sparc64/kernel/traps.c	2004-10-19 14:33:55.000000000 +1000
+++ linux-2.6.10-rc2-bk9-Misc/arch/sparc64/kernel/traps.c	2004-11-27 14:52:24.789588912 +1100
@@ -37,9 +37,6 @@
 #include <asm/processor.h>
 #include <asm/timer.h>
 #include <asm/kdebug.h>
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 struct notifier_block *sparc64die_chain;
 static spinlock_t die_notifier_lock = SPIN_LOCK_UNLOCKED;
Index: linux-2.6.10-rc2-bk9-Misc/net/bluetooth/af_bluetooth.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/net/bluetooth/af_bluetooth.c	2004-11-16 15:30:11.000000000 +1100
+++ linux-2.6.10-rc2-bk9-Misc/net/bluetooth/af_bluetooth.c	2004-11-27 14:49:51.122949792 +1100
@@ -38,11 +38,8 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
-#include <net/sock.h>
-
-#if defined(CONFIG_KMOD)
 #include <linux/kmod.h>
-#endif
+#include <net/sock.h>
 
 #include <net/bluetooth/bluetooth.h>
 
Index: linux-2.6.10-rc2-bk9-Misc/drivers/scsi/pluto.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/scsi/pluto.c	2004-09-28 16:22:09.000000000 +1000
+++ linux-2.6.10-rc2-bk9-Misc/drivers/scsi/pluto.c	2004-11-27 14:49:51.037962712 +1100
@@ -14,9 +14,7 @@
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <asm/irq.h>
 
Index: linux-2.6.10-rc2-bk9-Misc/drivers/scsi/fcal.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/scsi/fcal.c	2004-09-28 16:22:09.000000000 +1000
+++ linux-2.6.10-rc2-bk9-Misc/drivers/scsi/fcal.c	2004-11-27 14:49:51.015966056 +1100
@@ -14,9 +14,7 @@
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <asm/irq.h>
 
Index: linux-2.6.10-rc2-bk9-Misc/drivers/md/md.c
===================================================================
--- linux-2.6.10-rc2-bk9-Misc.orig/drivers/md/md.c	2004-11-16 15:29:26.000000000 +1100
+++ linux-2.6.10-rc2-bk9-Misc/drivers/md/md.c	2004-11-27 14:49:50.994969248 +1100
@@ -39,10 +39,7 @@
 #include <linux/suspend.h>
 
 #include <linux/init.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <asm/unaligned.h>