Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

1 files changed, 26 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 6a44defac3ec..3b5adbf228c7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -316,9 +316,16 @@ config CPUSETS
 
           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"
-        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.
@@ -326,7 +333,7 @@ config 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"
@@ -627,6 +634,14 @@ config ELF_CORE
         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
@@ -825,6 +840,15 @@ menuconfig MODULES
 
           If unsure, say Y.
 
+config MODULE_FORCE_LOAD
+        bool "Forced module loading"
+        depends on MODULES
+        default n
+        help
+          This option allows loading of modules even if that would set the
+          'F' (forced) taint, due to lack of version info.  Which is
+          usually a really bad idea.
+
 config MODULE_UNLOAD
         bool "Module unloading"
         depends on MODULES