diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
| commit | 821f3eff7cdb9d6c7076effabd46c96c322daed1 (patch) | |
| tree | 60f13155196fd6c84424c8aebc133ca4a5f56749 /scripts/kconfig/zconf.y | |
| parent | ebc283118ee448dcb6e6cae74a8a43f17a1ccc3f (diff) | |
| parent | f77bf01425b11947eeb3b5b54685212c302741b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
Diffstat (limited to 'scripts/kconfig/zconf.y')
| -rw-r--r-- | scripts/kconfig/zconf.y | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 79db4cf22a51..d9b96ba8e38c 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
| @@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry; | |||
| 64 | %token <id>T_IF | 64 | %token <id>T_IF |
| 65 | %token <id>T_ENDIF | 65 | %token <id>T_ENDIF |
| 66 | %token <id>T_DEPENDS | 66 | %token <id>T_DEPENDS |
| 67 | %token <id>T_REQUIRES | ||
| 68 | %token <id>T_OPTIONAL | 67 | %token <id>T_OPTIONAL |
| 69 | %token <id>T_PROMPT | 68 | %token <id>T_PROMPT |
| 70 | %token <id>T_TYPE | 69 | %token <id>T_TYPE |
| @@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL | |||
| 418 | { | 417 | { |
| 419 | menu_add_dep($3); | 418 | menu_add_dep($3); |
| 420 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); | 419 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); |
| 421 | } | ||
| 422 | | T_DEPENDS expr T_EOL | ||
| 423 | { | ||
| 424 | menu_add_dep($2); | ||
| 425 | printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno()); | ||
| 426 | } | ||
| 427 | | T_REQUIRES expr T_EOL | ||
| 428 | { | ||
| 429 | menu_add_dep($2); | ||
| 430 | printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno()); | ||
| 431 | }; | 420 | }; |
| 432 | 421 | ||
| 433 | /* prompt statement */ | 422 | /* prompt statement */ |