Merge git://oss.sgi.com:8090/xfs/linux-2.6

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 43d6989c275f3432a0404771af92015f13717a01..b678803deccf964f5a2bf29afee202aaf3d75965 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 

-         If unsure, say N.
+         If unsure, say Y.

 
 config SYSCTL
        bool
 
 config SYSCTL
        bool


@@ -802,6 +802,10 @@ config PROC_PAGE_MONITOR
 
 endmenu                # General setup
 
 
 endmenu                # General setup
 

+config HAVE_GENERIC_DMA_COHERENT
+       bool
+       default n
+

 config SLABINFO
        bool
        depends on PROC_FS
 config SLABINFO
        bool
        depends on PROC_FS


@@ -841,9 +845,10 @@ menuconfig MODULES
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+if MODULES
+

 config MODULE_FORCE_LOAD
        bool "Forced module loading"
 config MODULE_FORCE_LOAD
        bool "Forced module loading"

-       depends on MODULES

        default n
        help
          Allow loading of modules without version information (ie. modprobe
        default n
        help
          Allow loading of modules without version information (ie. modprobe


@@ -852,7 +857,6 @@ config MODULE_FORCE_LOAD
 
 config MODULE_UNLOAD
        bool "Module unloading"
 
 config MODULE_UNLOAD
        bool "Module unloading"

-       depends on MODULES

        help
          Without this option you will not be able to unload any
          modules (note that some modules may not be unloadable
        help
          Without this option you will not be able to unload any
          modules (note that some modules may not be unloadable


@@ -871,7 +875,6 @@ config MODULE_FORCE_UNLOAD
 
 config MODVERSIONS
        bool "Module versioning support"
 
 config MODVERSIONS
        bool "Module versioning support"

-       depends on MODULES

        help
          Usually, you have to use modules compiled with your kernel.
          Saying Y here makes it sometimes possible to use modules
        help
          Usually, you have to use modules compiled with your kernel.
          Saying Y here makes it sometimes possible to use modules


@@ -882,7 +885,6 @@ config MODVERSIONS
 
 config MODULE_SRCVERSION_ALL
        bool "Source checksum for all modules"
 
 config MODULE_SRCVERSION_ALL
        bool "Source checksum for all modules"

-       depends on MODULES

        help
          Modules which contain a MODULE_VERSION get an extra "srcversion"
          field inserted into their modinfo section, which contains a
        help
          Modules which contain a MODULE_VERSION get an extra "srcversion"
          field inserted into their modinfo section, which contains a


@@ -894,11 +896,12 @@ config MODULE_SRCVERSION_ALL
 
 config KMOD
        def_bool y
 
 config KMOD
        def_bool y

-       depends on MODULES

        help
          This is being removed soon.  These days, CONFIG_MODULES
          implies CONFIG_KMOD, so use that instead.
 
        help
          This is being removed soon.  These days, CONFIG_MODULES
          implies CONFIG_KMOD, so use that instead.
 

+endif # MODULES
+

 config STOP_MACHINE
        bool
        default y
 config STOP_MACHINE
        bool
        default y