diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:28:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:28:17 -0800 |
commit | f28b1c8aaa97a68028bb894bffb1690185c62b01 (patch) | |
tree | 4dfd0e1dff2324ed70e2365d2314ff3ec7f7c751 /scripts/kconfig/conf.c | |
parent | 0c05384a5a1af2352b8c244cf32f480ba6cbf024 (diff) | |
parent | 39177ec36236fb71257e51d0d198437b84170911 (diff) | |
download | linux-f28b1c8aaa97a68028bb894bffb1690185c62b01.tar.gz linux-f28b1c8aaa97a68028bb894bffb1690185c62b01.tar.bz2 linux-f28b1c8aaa97a68028bb894bffb1690185c62b01.zip |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
nconf: handle comment entries within choice/endchoice
kconfig: fix warning
kconfig: Make expr_copy() take a const argument
kconfig: simplify select-with-unmet-direct-dependency warning
kconfig: add more S_INT and S_HEX consistency checks
kconfig: fix `zconfdebug' extern declaration
kconfig/conf: merge duplicate switch's case
kconfig: fix typos
kbuild/gconf: add dummy inline for bind_textdomain_codeset()
kbuild/nconf: fix spaces damage
kconfig: nuke second argument of conf_write_symbol()
kconfig: do not define AUTOCONF_INCLUDED
kconfig: the day kconfig warns about "select"-abuse has come
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 5459a38be866..659326c3e895 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -529,8 +529,6 @@ int main(int ac, char **av) } break; case savedefconfig: - conf_read(NULL); - break; case silentoldconfig: case oldaskconfig: case oldconfig: |