3 files changed, 6 insertions, 15 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f000edb3bb7a..a3f83e2c8250 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -450,7 +450,7 @@ config SHMEM
 
 config SLAB
         default y
-        bool "Use full SLAB allocator" if EMBEDDED
+        bool "Use full SLAB allocator" if (EMBEDDED && !SMP && !SPARSEMEM)
         help
           Disabling this replaces the advanced SLAB allocator and
           kmalloc support with the drastically simpler SLOB allocator.
@@ -461,10 +461,10 @@ config VM_EVENT_COUNTERS
         default y
         bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
         help
-          VM event counters are only needed to for event counts to be
-          shown. They have no function for the kernel itself. This
-          option allows the disabling of the VM event counters.
-          /proc/vmstat will only show page counts.
+          VM event counters are needed for event counts to be shown.
+          This option allows the disabling of the VM event counters
+          on EMBEDDED systems.  /proc/vmstat will only show page counts
+          if VM event counters are disabled.
 
 endmenu         # General setup
 
diff --git a/init/Makefile b/init/Makefile
index d6c764d0eabb..9cd871ce5784 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -18,12 +18,3 @@ clean-files := ../include/linux/compile.h
 $(obj)/main.o: include/linux/compile.h
 $(obj)/version.o: include/linux/compile.h
 
-# compile.h changes depending on hostname, generation number, etc,
-# so we regenerate it always.
-# mkcompile_h will make sure to only update the
-# actual file if its content has changed.
-
-include/linux/compile.h: FORCE
-        @echo '  CHK     $@'
-        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
-        "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(CFLAGS)"
diff --git a/init/main.c b/init/main.c
index e3f0bb20b4dd..2b1cdaab45e6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -53,6 +53,7 @@
 #include <linux/utsrelease.h>
 #include <linux/pid_namespace.h>
 #include <linux/compile.h>
+#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -94,7 +95,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void driver_init(void);
 extern void prepare_namespace(void);
 #ifdef  CONFIG_ACPI
 extern void acpi_early_init(void);