r8169: revert bogus BMCR reset

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4381006dd666aaba6f9d1e29913d65fe5c3e5a8c..b170aa1d43bd127c75b7380237e18bbb2f1c3f2e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,5 +1,6 @@
 config DEFCONFIG_LIST
        string
 config DEFCONFIG_LIST
        string

+       depends on !UML

        option defconfig_list
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        option defconfig_list
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"


@@ -92,7 +93,7 @@ config LOCALVERSION_AUTO
 
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
 
 config SWAP
        bool "Support for paging of anonymous memory (swap)"

-       depends on MMU
+       depends on MMU && BLOCK

        default y
        help
          This option allows you to choose whether you want to have support
        default y
        help
          This option allows you to choose whether you want to have support


@@ -115,6 +116,21 @@ config SYSVIPC
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 

+config IPC_NS
+       bool "IPC Namespaces"
+       depends on SYSVIPC
+       default n
+       help
+         Support ipc namespaces.  This allows containers, i.e. virtual
+         environments, to use ipc namespaces to provide different ipc
+         objects for different servers.  If unsure, say N.
+
+config SYSVIPC_SYSCTL
+       bool
+       depends on SYSVIPC
+       depends on SYSCTL
+       default y
+

 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL
 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL


@@ -182,6 +198,32 @@ config TASK_DELAY_ACCT
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config TASK_XACCT
+       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+       depends on TASKSTATS
+       help
+         Collect extended task accounting data and send the data
+         to userland for processing over the taskstats interface.
+
+         Say N if unsure.
+
+config TASK_IO_ACCOUNTING
+       bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
+       depends on TASK_XACCT
+       help
+         Collect information on the number of bytes of storage I/O which this
+         task has caused.
+
+         Say N if unsure.
+
+config UTS_NS
+       bool "UTS Namespaces"
+       default n
+       help
+         Support uts namespaces.  This allows containers, i.e.
+         vservers, to use uts namespaces to provide different
+         uts info for different servers.  If unsure, say N.
+

 config AUDIT
        bool "Auditing support"
        depends on NET
 config AUDIT
        bool "Auditing support"
        depends on NET


@@ -202,7 +244,7 @@ config AUDITSYSCALL
          ensure that INOTIFY is configured.
 
 config IKCONFIG
          ensure that INOTIFY is configured.
 
 config IKCONFIG

-       bool "Kernel .config support"
+       tristate "Kernel .config support"

        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation
        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation


@@ -231,6 +273,26 @@ config CPUSETS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config SYSFS_DEPRECATED
+       bool "Create deprecated sysfs files"
+       default y
+       help
+         This option creates deprecated symlinks such as the
+         "device"-link, the <subsystem>:<name>-link, and the
+         "bus"-link. It may also add deprecated key in the
+         uevent environment.
+         None of these features or values should be used today, as
+         they export driver core implementation details to userspace
+         or export properties which can't be kept stable across kernel
+         releases.
+
+         If enabled, this option will also move any device structures
+         that belong to a class, back into the /sys/class heirachy, 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.
+

 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"
        help
 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"
        help


@@ -242,8 +304,28 @@ config RELAY
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config BLK_DEV_INITRD
+       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+       depends on BROKEN || !FRV
+       help
+         The initial RAM filesystem is a ramfs which is loaded by the
+         boot loader (loadlin or lilo) and that is mounted as root
+         before the normal boot procedure. It is typically used to
+         load modules needed to mount the "real" root file system,
+         etc. See <file:Documentation/initrd.txt> for details.
+
+         If RAM disk support (BLK_DEV_RAM) is also included, this
+         also enables initial RAM disk (initrd) support and adds
+         15 Kbytes (more on some other architectures) to the kernel size.
+
+         If unsure say Y.
+
+if BLK_DEV_INITRD
+

 source "usr/Kconfig"
 
 source "usr/Kconfig"
 

+endif
+

 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y


@@ -257,6 +339,9 @@ config CC_OPTIMIZE_FOR_SIZE
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config SYSCTL
+       bool
+

 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help


@@ -272,28 +357,24 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
        help
          This enables the legacy 16-bit UID syscall wrappers.
 

-config SYSCTL
-       bool
-

 config SYSCTL_SYSCALL
 config SYSCTL_SYSCALL

-       bool "Sysctl syscall support"
-       default n
+       bool "Sysctl syscall support" if EMBEDDED
+       default y

        select SYSCTL
        ---help---
        select SYSCTL
        ---help---

-         Enable the deprecated sysctl system call.  sys_sysctl uses
-         binary paths that have been found to be a major pain to maintain
-         and use.  The interface in /proc/sys is now the primary and what
-         everyone uses.
+         sys_sysctl uses binary paths that have been found challenging
+         to properly maintain and use.  The interface in /proc/sys
+         using paths with ascii names is now the primary path to this
+         information.

 
 

-         Nothing has been using the binary sysctl interface for some time
-         time now so nothing should break if you disable sysctl syscall
-         support, and you kernel will get marginally smaller.
+         Almost nothing using the binary sysctl interface so if you are
+         trying to save some space it is probably safe to disable this,
+         making your kernel marginally smaller.

 
 

-         Unless you have an application that uses the sys_syscall interface
-         you should probably say N here.
+         If unsure say Y here.

 
 config KALLSYMS
 
 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


@@ -395,7 +476,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.


@@ -406,10 +487,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