diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2009-10-15 20:03:20 +0200 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2009-10-15 20:10:12 +0200 |
| commit | 1456edbb1476db735715ddcc7ac306de587024eb (patch) | |
| tree | 569701addf41a0e5ae68d78e1fd47e7ec6865575 /scripts/kconfig/zconf.y | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| download | linux-1456edbb1476db735715ddcc7ac306de587024eb.tar.xz linux-1456edbb1476db735715ddcc7ac306de587024eb.zip | |
kconfig: Make zconf.y work with current bison
zconf.y includes zconf.hash.c from the initial code section.
zconf.hash.c references the token constants from zconf.y. However,
current bison defines the token constants after the initial code
section, making zconf.hash.c fail to compile. Move the include of
zconf.hash.c later in zconf.y, so bison puts it after the token
constants.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'scripts/kconfig/zconf.y')
| -rw-r--r-- | scripts/kconfig/zconf.y | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 9710b82466f2..01ec550ec01b 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -14,8 +14,6 @@ #define LKC_DIRECT_LINK #include "lkc.h" -#include "zconf.hash.c" - #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) #define PRINTD 0x0001 @@ -100,6 +98,11 @@ static struct menu *current_menu, *current_entry; menu_end_menu(); } if_entry menu_entry choice_entry +%{ +/* Include zconf.hash.c here so it can see the token constants. */ +#include "zconf.hash.c" +%} + %% input: stmt_list; |