Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 6a44def..6199d11 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        default "/boot/config-$UNAME_RELEASE"
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        default "/boot/config-$UNAME_RELEASE"

+       default "$ARCH_DEFCONFIG"

        default "arch/$ARCH/defconfig"
 
 menu "General setup"
        default "arch/$ARCH/defconfig"
 
 menu "General setup"


@@ -316,9 +317,16 @@ config CPUSETS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+#
+# Architectures with an unreliable sched_clock() should select this:
+#
+config HAVE_UNSTABLE_SCHED_CLOCK
+       bool
+

 config GROUP_SCHED
        bool "Group CPU scheduler"
 config GROUP_SCHED
        bool "Group CPU scheduler"

-       default y
+       depends on EXPERIMENTAL
+       default n

        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.
        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.


@@ -326,7 +334,7 @@ config GROUP_SCHED
 config FAIR_GROUP_SCHED
        bool "Group scheduling for SCHED_OTHER"
        depends on GROUP_SCHED
 config FAIR_GROUP_SCHED
        bool "Group scheduling for SCHED_OTHER"
        depends on GROUP_SCHED

-       default y
+       default GROUP_SCHED

 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"


@@ -627,6 +635,14 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 

+config PCSPKR_PLATFORM
+       bool "Enable PC-Speaker support" if EMBEDDED
+       depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+       default y
+       help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+

 config COMPAT_BRK
        bool "Disable heap randomization"
        default y
 config COMPAT_BRK
        bool "Disable heap randomization"
        default y


@@ -825,6 +841,15 @@ menuconfig MODULES
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config MODULE_FORCE_LOAD
+       bool "Forced module loading"
+       depends on MODULES
+       default n
+       help
+         Allow loading of modules without version information (ie. modprobe
+         --force).  Forced module loading sets the 'F' (forced) taint flag and
+         is usually a really bad idea.
+

 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES
 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES