From f49e5647b85b8906a6984821a281817cc369b8ae Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 16 Jan 2006 22:13:59 -0800
Subject: [PATCH] --- yaml --- r: 18631 b: refs/heads/master c:
 fd279197b1df6b46076991ca0e1f7faa8f3d8028 h: refs/heads/master i:   18629:
 d4735915085797366e8056dbb06454ea0ed0a184   18627:
 69fbe29a20239de0a12244e64347bc5d6a090af8   18623:
 45c7aa2a11ea3629ea92a8e6ba4af78968db7925 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/chips/Kconfig   | 1 +
 trunk/drivers/mtd/devices/Kconfig | 1 +
 trunk/init/Kconfig                | 3 +++
 trunk/kernel/Makefile             | 3 ++-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a30878e420c..e67ab1b3a757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3001aa826ea6a4de12b437188c2a095991d2d142
+refs/heads/master: fd279197b1df6b46076991ca0e1f7faa8f3d8028
diff --git a/trunk/drivers/mtd/chips/Kconfig b/trunk/drivers/mtd/chips/Kconfig
index 25f8217a671d..effa0d7a73ac 100644
--- a/trunk/drivers/mtd/chips/Kconfig
+++ b/trunk/drivers/mtd/chips/Kconfig
@@ -31,6 +31,7 @@ config MTD_JEDECPROBE
 
 config MTD_GEN_PROBE
 	tristate
+	select OBSOLETE_INTERMODULE
 
 config MTD_CFI_ADV_OPTIONS
 	bool "Flash chip driver advanced configuration options"
diff --git a/trunk/drivers/mtd/devices/Kconfig b/trunk/drivers/mtd/devices/Kconfig
index 5038e90ceb12..dd628cb51e31 100644
--- a/trunk/drivers/mtd/devices/Kconfig
+++ b/trunk/drivers/mtd/devices/Kconfig
@@ -218,6 +218,7 @@ config MTD_DOC2001PLUS
 config MTD_DOCPROBE
 	tristate
 	select MTD_DOCECC
+	select OBSOLETE_INTERMODULE
 
 config MTD_DOCECC
 	tristate
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 7efa729d2cf4..b9923b1434a2 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -427,6 +427,9 @@ config SLOB
 	default !SLAB
 	bool
 
+config OBSOLETE_INTERMODULE
+	tristate
+
 menu "Loadable module support"
 
 config MODULES
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index 355126606d1b..4ae0fbde815d 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -6,7 +6,7 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
 	    exit.o itimer.o time.o softirq.o resource.o \
 	    sysctl.o capability.o ptrace.o timer.o user.o \
 	    signal.o sys.o kmod.o workqueue.o pid.o \
-	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
 	    hrtimer.o
 
@@ -17,6 +17,7 @@ obj-$(CONFIG_SMP) += cpu.o spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
+obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_PM) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o