[Bluetooth] Handle device registration failures

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 9edf103..a3f83e2 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -348,7 +348,7 @@ config SYSCTL_SYSCALL
          If unsure say Y here.
 
 config KALLSYMS
          If unsure say Y here.
 
 config KALLSYMS

-        bool "Load all symbols for debugging/kksymoops" if EMBEDDED
+        bool "Load all symbols for debugging/ksymoops" if EMBEDDED

         default y
         help
           Say Y here to let the kernel print out symbolic crash information and
         default y
         help
           Say Y here to let the kernel print out symbolic crash information and


@@ -450,7 +450,7 @@ config SHMEM
 
 config SLAB
        default y
 
 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.
        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
        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
 
 
 endmenu                # General setup