diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /Documentation/kbuild/kconfig.txt | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'Documentation/kbuild/kconfig.txt')
| -rw-r--r-- | Documentation/kbuild/kconfig.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index b2cb16ebcb1..cca46b1a0f6 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt @@ -65,7 +65,7 @@ also use the environment variable KCONFIG_ALLCONFIG as a flag or a filename that contains config symbols that the user requires to be set to a specific value. If KCONFIG_ALLCONFIG is used without a filename, "make *config" checks for a file named -"all{yes/mod/no/random}.config" (corresponding to the *config command +"all{yes/mod/no/def/random}.config" (corresponding to the *config command that was used) for symbol values that are to be forced. If this file is not found, it checks for a file named "all.config" to contain forced values. |