diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 11:34:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 11:34:25 -0400 |
| commit | 5b4197845ad1a33bc57da7ee5ea41de58c2f86bf (patch) | |
| tree | 87139e25612c78431584f953053ae81ead30b27b /init/Kconfig | |
| parent | a22a0fdba4191473581f86c9dd5361cf581521d3 (diff) | |
| parent | e062781397e5bebc6c1b8dd4bf466136e13ae4c5 (diff) | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig updates from Michal Marek:
"This is the kconfig part of kbuild for v3.12-rc1:
- post-3.11 search code fixes and micro-optimizations
- CONFIG_MODULES is no longer a special case; this is needed to
eventually fix the bug that using KCONFIG_ALLCONFIG breaks
allmodconfig
- long long is used to store hex and int values
- make silentoldconfig no longer warns when a symbol changes from
tristate to bool (it's a job for make oldconfig)
- scripts/diffconfig updated to work with newer Pythons
- scripts/config does not rely on GNU sed extensions"
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kconfig: do not allow more than one symbol to have 'option modules'
kconfig: regenerate bison parser
kconfig: do not special-case 'MODULES' symbol
diffconfig: Update script to support python versions 2.5 through 3.3
diffconfig: Gracefully exit if the default config files are not present
modules: do not depend on kconfig to set 'modules' option to symbol MODULES
kconfig: silence warning when parsing auto.conf when a symbol has changed type
scripts/config: use sed's POSIX interface
kconfig: switch to "long long" for sanity
kconfig: simplify symbol-search code
kconfig: don't allocate n+1 elements in temporary array
kconfig: minor style fixes in symbol-search code
kconfig/[mn]conf: shorten title in search-box
kconfig: avoid multiple calls to strlen
Documentation/kconfig: more concise and straightforward search explanation
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index bfa9e13c9a93..18bd9e3d3274 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1670,6 +1670,7 @@ config BASE_SMALL | |||
| 1670 | 1670 | ||
| 1671 | menuconfig MODULES | 1671 | menuconfig MODULES |
| 1672 | bool "Enable loadable module support" | 1672 | bool "Enable loadable module support" |
| 1673 | option modules | ||
| 1673 | help | 1674 | help |
| 1674 | Kernel modules are small pieces of compiled code which can | 1675 | Kernel modules are small pieces of compiled code which can |
| 1675 | be inserted in the running kernel, rather than being | 1676 | be inserted in the running kernel, rather than being |