Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[powerpc.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index e205682..96b5459 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -7,7 +7,7 @@ config DEFCONFIG_LIST
        default "/boot/config-$UNAME_RELEASE"
        default "arch/$ARCH/defconfig"
 
        default "/boot/config-$UNAME_RELEASE"
        default "arch/$ARCH/defconfig"
 

-menu "Code maturity level options"
+menu "General setup"

 
 config EXPERIMENTAL
        bool "Prompt for development and/or incomplete code/drivers"
 
 config EXPERIMENTAL
        bool "Prompt for development and/or incomplete code/drivers"


@@ -61,9 +61,6 @@ config INIT_ENV_ARG_LIMIT
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
 
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
 

-endmenu
-
-menu "General setup"

 
 config LOCALVERSION
        string "Local version - append to kernel release"
 
 config LOCALVERSION
        string "Local version - append to kernel release"


@@ -340,7 +337,7 @@ 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

-       depends on ARM || H8300 || EXPERIMENTAL
+       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.


@@ -468,25 +465,19 @@ config FUTEX
          run glibc-based applications correctly.
 
 config ANON_INODES
          run glibc-based applications correctly.
 
 config ANON_INODES

-       bool "Enable anonymous inode source" if EMBEDDED
-       default y
-       help
-         Anonymous inode source for pseudo-files like epoll, signalfd,
-         timerfd and eventfd.
-
-         If unsure, say Y.
+       bool

 
 config EPOLL
        bool "Enable eventpoll support" if EMBEDDED
        default y
 
 config EPOLL
        bool "Enable eventpoll support" if EMBEDDED
        default y

-       depends on ANON_INODES
+       select ANON_INODES

        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EMBEDDED
        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES

        default y
        help
          Enable the signalfd() system call that allows to receive signals
        default y
        help
          Enable the signalfd() system call that allows to receive signals


@@ -496,7 +487,7 @@ config SIGNALFD
 
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED
 
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES

        default y
        help
          Enable the timerfd() system call that allows to receive timer
        default y
        help
          Enable the timerfd() system call that allows to receive timer


@@ -506,7 +497,7 @@ config TIMERFD
 
 config EVENTFD
        bool "Enable eventfd() system call" if EMBEDDED
 
 config EVENTFD
        bool "Enable eventfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES

        default y
        help
          Enable the eventfd() system call that allows to receive both
        default y
        help
          Enable the eventfd() system call that allows to receive both