watchdog: davinci: reuse driver for keystone arch

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4e5d96ab2034c25e2c1bb38d4ab9e619f8e04e86..34a0a3bf2390dc162ee524c848cf44bd7b5a7a10 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -532,7 +532,7 @@ config CONTEXT_TRACKING_FORCE
          dynticks subsystem by forcing the context tracking on all
          CPUs in the system.
 
          dynticks subsystem by forcing the context tracking on all
          CPUs in the system.
 

-         Say Y only if you're working on the developpement of an
+         Say Y only if you're working on the development of an

          architecture backend for the context tracking.
 
          Say N otherwise, this option brings an overhead that you
          architecture backend for the context tracking.
 
          Say N otherwise, this option brings an overhead that you


@@ -854,7 +854,6 @@ config NUMA_BALANCING
 
 menuconfig CGROUPS
        boolean "Control Group support"
 
 menuconfig CGROUPS
        boolean "Control Group support"

-       depends on EVENTFD

        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory
        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory


@@ -921,6 +920,7 @@ config MEMCG
        bool "Memory Resource Controller for Control Groups"
        depends on RESOURCE_COUNTERS
        select MM_OWNER
        bool "Memory Resource Controller for Control Groups"
        depends on RESOURCE_COUNTERS
        select MM_OWNER

+       select EVENTFD

        help
          Provides a memory resource controller that manages both anonymous
          memory and page cache. (See Documentation/cgroups/memory.txt)
        help
          Provides a memory resource controller that manages both anonymous
          memory and page cache. (See Documentation/cgroups/memory.txt)


@@ -1116,8 +1116,6 @@ config IPC_NS
 
 config USER_NS
        bool "User namespace"
 
 config USER_NS
        bool "User namespace"

-       select UIDGID_STRICT_TYPE_CHECKS
-

        default n
        help
          This allows containers, i.e. vservers, to use user namespaces
        default n
        help
          This allows containers, i.e. vservers, to use user namespaces


@@ -1149,18 +1147,8 @@ config NET_NS
 
 endif # NAMESPACES
 
 
 endif # NAMESPACES
 

-config UIDGID_STRICT_TYPE_CHECKS
-       bool "Require conversions between uid/gids and their internal representation"
-       default n
-       help
-        While the nececessary conversions are being added to all subsystems this option allows
-        the code to continue to build for unconverted subsystems.
-
-        Say Y here if you want the strict type checking enabled
-

 config SCHED_AUTOGROUP
        bool "Automatic process group scheduling"
 config SCHED_AUTOGROUP
        bool "Automatic process group scheduling"

-       select EVENTFD

        select CGROUPS
        select CGROUP_SCHED
        select FAIR_GROUP_SCHED
        select CGROUPS
        select CGROUP_SCHED
        select FAIR_GROUP_SCHED