i2c: Switch pasemi to the new device/driver matching scheme

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index dcef8b55011a01db4031b821d99a3b80f44f9d99..6135d07f31ece506c597e06c04d220d53308fbfe 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -259,17 +259,14 @@ config IKCONFIG_PROC
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21

-       default 17 if S390 || LOCKDEP
-       default 16 if X86_NUMAQ || IA64
-       default 15 if SMP
-       default 14
+       default 17

        help
          Select kernel log buffer size as a power of 2.
        help
          Select kernel log buffer size as a power of 2.

-         Defaults and Examples:
-                    17 => 128 KB for S/390
-                    16 => 64 KB for x86 NUMAQ or IA-64
-                    15 => 32 KB for SMP
-                    14 => 16 KB for uniprocessor
+         Examples:
+                    17 => 128 KB
+                    16 => 64 KB
+                    15 => 32 KB
+                    14 => 16 KB

                     13 =>  8 KB
                     12 =>  4 KB
 
                     13 =>  8 KB
                     12 =>  4 KB
 


@@ -284,6 +281,7 @@ config CGROUPS
 config CGROUP_DEBUG
        bool "Example debug cgroup subsystem"
        depends on CGROUPS
 config CGROUP_DEBUG
        bool "Example debug cgroup subsystem"
        depends on CGROUPS

+       default n

        help
          This option enables a simple cgroup subsystem that
          exports useful debugging information about the cgroups
        help
          This option enables a simple cgroup subsystem that
          exports useful debugging information about the cgroups


@@ -300,6 +298,13 @@ config CGROUP_NS
           for instance virtual servers and checkpoint/restart
           jobs.
 
           for instance virtual servers and checkpoint/restart
           jobs.
 

+config CGROUP_DEVICE
+       bool "Device controller for cgroups"
+       depends on CGROUPS && EXPERIMENTAL
+       help
+         Provides a cgroup implementing whitelists for devices which
+         a process in the cgroup can mknod or open.
+

 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS
 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS


@@ -311,9 +316,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.


@@ -321,13 +333,20 @@ 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"
        depends on EXPERIMENTAL
        depends on GROUP_SCHED
        default n
 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
        depends on EXPERIMENTAL
        depends on GROUP_SCHED
        default n

+       help
+         This feature lets you explicitly allocate real CPU bandwidth
+         to users or control groups (depending on the "Basis for grouping tasks"
+         setting below. If enabled, it will also make it impossible to
+         schedule realtime tasks for non-root users until you allocate
+         realtime bandwidth for them.
+         See Documentation/sched-rt-group.txt for more information.

 
 choice
        depends on GROUP_SCHED
 
 choice
        depends on GROUP_SCHED


@@ -366,10 +385,36 @@ config RESOURCE_COUNTERS
           infrastructure that works with cgroups
        depends on CGROUPS
 
           infrastructure that works with cgroups
        depends on CGROUPS
 

+config MM_OWNER
+       bool
+
+config CGROUP_MEM_RES_CTLR
+       bool "Memory Resource Controller for Control Groups"
+       depends on CGROUPS && RESOURCE_COUNTERS
+       select MM_OWNER
+       help
+         Provides a memory resource controller that manages both page cache and
+         RSS memory.
+
+         Note that setting this option increases fixed memory overhead
+         associated with each page of memory in the system by 4/8 bytes
+         and also increases cache misses because struct page on many 64bit
+         systems will not fit into a single cache line anymore.
+
+         Only enable when you're ok with these trade offs and really
+         sure you need the memory resource controller.
+
+         This config option also selects MM_OWNER config option, which
+         could in turn add some fork/exit overhead.
+

 config SYSFS_DEPRECATED
 config SYSFS_DEPRECATED

+       bool
+
+config SYSFS_DEPRECATED_V2

        bool "Create deprecated sysfs files"
        depends on SYSFS
        default y
        bool "Create deprecated sysfs files"
        depends on SYSFS
        default y

+       select SYSFS_DEPRECATED

        help
          This option creates deprecated symlinks such as the
          "device"-link, the <subsystem>:<name>-link, and the
        help
          This option creates deprecated symlinks such as the
          "device"-link, the <subsystem>:<name>-link, and the


@@ -382,17 +427,11 @@ config SYSFS_DEPRECATED
 
          If enabled, this option will also move any device structures
          that belong to a class, back into the /sys/class hierarchy, in
 
          If enabled, this option will also move any device structures
          that belong to a class, back into the /sys/class hierarchy, in

-         order to support older versions of udev.
-
-         If you are using a distro that was released in 2006 or later,
-         it should be safe to say N here.
+         order to support older versions of udev and some userspace
+         programs.

 
 

-config CGROUP_MEM_CONT
-       bool "Memory controller for cgroups"
-       depends on CGROUPS && RESOURCE_COUNTERS
-       help
-         Provides a memory controller that manages both page cache and
-         RSS memory.
+         If you are using a distro with the most recent userspace
+         packages, it should be safe to say N here.

 
 config PROC_PID_CPUSET
        bool "Include legacy /proc/<pid>/cpuset file"
 
 config PROC_PID_CPUSET
        bool "Include legacy /proc/<pid>/cpuset file"


@@ -476,16 +515,12 @@ source "usr/Kconfig"
 endif
 
 config CC_OPTIMIZE_FOR_SIZE
 endif
 
 config CC_OPTIMIZE_FOR_SIZE

-       bool "Optimize for size (Look out for broken compilers!)"
+       bool "Optimize for size"

        default y
        default y

-       depends on ARM || H8300 || SUPERH || EXPERIMENTAL

        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 

-         WARNING: some versions of gcc may generate incorrect code with this
-         option.  If problems are observed, a gcc upgrade may be needed.
-

          If unsure, say N.
 
 config SYSCTL
          If unsure, say N.
 
 config SYSCTL


@@ -501,7 +536,7 @@ menuconfig EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED

-       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
+       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)

        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.


@@ -522,6 +557,17 @@ config SYSCTL_SYSCALL
 
          If unsure say Y here.
 
 
          If unsure say Y here.
 

+config SYSCTL_SYSCALL_CHECK
+       bool "Sysctl checks" if EMBEDDED
+       depends on SYSCTL_SYSCALL
+       default y
+       ---help---
+         sys_sysctl uses binary paths that have been found challenging
+         to properly maintain and use. This enables checks that help
+         you to keep things correct.
+
+         If unsure say Y here.
+

 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
         default y
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
         default y


@@ -588,6 +634,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


@@ -681,7 +735,7 @@ config VM_EVENT_COUNTERS
 config SLUB_DEBUG
        default y
        bool "Enable SLUB debugging support" if EMBEDDED
 config SLUB_DEBUG
        default y
        bool "Enable SLUB debugging support" if EMBEDDED

-       depends on SLUB
+       depends on SLUB && SYSFS

        help
          SLUB has extensive debug support features. Disabling these can
          result in significant savings in code size. This also disables
        help
          SLUB has extensive debug support features. Disabling these can
          result in significant savings in code size. This also disables


@@ -750,7 +804,7 @@ endmenu             # General setup
 config SLABINFO
        bool
        depends on PROC_FS
 config SLABINFO
        bool
        depends on PROC_FS

-       depends on SLAB || SLUB
+       depends on SLAB || SLUB_DEBUG

        default y
 
 config RT_MUTEXES
        default y
 
 config RT_MUTEXES


@@ -786,6 +840,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


@@ -852,38 +915,10 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
        bool
 
 config PREEMPT_NOTIFIERS
        bool
 

-choice
-       prompt "RCU implementation type:"
-       default CLASSIC_RCU
-       help
-         This allows you to choose either the classic RCU implementation
-         that is designed for best read-side performance on non-realtime
-         systems, or the preemptible RCU implementation for best latency
-         on realtime systems.  Note that some kernel preemption modes
-         will restrict your choice.
-
-         Select the default if you are unsure.
-

 config CLASSIC_RCU
 config CLASSIC_RCU

-       bool "Classic RCU"
+       def_bool !PREEMPT_RCU

        help
          This option selects the classic RCU implementation that is
          designed for best read-side performance on non-realtime
        help
          This option selects the classic RCU implementation that is
          designed for best read-side performance on non-realtime

-         systems.
-
-         Say Y if you are unsure.
-
-config PREEMPT_RCU
-       bool "Preemptible RCU"
-       depends on PREEMPT
-       help
-         This option reduces the latency of the kernel by making certain
-         RCU sections preemptible. Normally RCU code is non-preemptible, if
-         this option is selected then read-only RCU sections become
-         preemptible. This helps latency, but may expose bugs due to
-         now-naive assumptions about each RCU read-side critical section
-         remaining on a given CPU through its execution.
-
-         Say N if you are unsure.
-
-endchoice
+         systems.  Classic RCU is the default.  Note that the
+         PREEMPT_RCU symbol is used to select/deselect this option.