diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /scripts/kconfig/conf.c | |
parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index eba5906dc4ab..5459a38be866 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -598,12 +598,12 @@ int main(int ac, char **av) | |||
598 | break; | 598 | break; |
599 | case savedefconfig: | 599 | case savedefconfig: |
600 | break; | 600 | break; |
601 | case oldconfig: | ||
602 | case oldaskconfig: | 601 | case oldaskconfig: |
603 | rootEntry = &rootmenu; | 602 | rootEntry = &rootmenu; |
604 | conf(&rootmenu); | 603 | conf(&rootmenu); |
605 | input_mode = silentoldconfig; | 604 | input_mode = silentoldconfig; |
606 | /* fall through */ | 605 | /* fall through */ |
606 | case oldconfig: | ||
607 | case listnewconfig: | 607 | case listnewconfig: |
608 | case oldnoconfig: | 608 | case oldnoconfig: |
609 | case silentoldconfig: | 609 | case silentoldconfig: |