summaryrefslogtreecommitdiffstats
path: root/package/config/zconf.y
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-06-19 08:11:51 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-06-19 08:11:51 +0000
commite2c32ba54b2fcf27a766e9c3cb427180a03ea056 (patch)
treed807979670ce4d6961f08ce8f2f9da1cdb57c5aa /package/config/zconf.y
parent1b6f2e0f4c8445100f1ea6bea5b89db15dba0175 (diff)
downloadbuildroot-novena-e2c32ba54b2fcf27a766e9c3cb427180a03ea056.tar.gz
buildroot-novena-e2c32ba54b2fcf27a766e9c3cb427180a03ea056.zip
package/config: rebase from upstream (2.6.24.4)
From Bernhards tree (1af211ea)
Diffstat (limited to 'package/config/zconf.y')
-rw-r--r--package/config/zconf.y11
1 files changed, 0 insertions, 11 deletions
diff --git a/package/config/zconf.y b/package/config/zconf.y
index ca435c5f9..34c907b49 100644
--- a/package/config/zconf.y
+++ b/package/config/zconf.y
@@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry;
%token <id>T_IF
%token <id>T_ENDIF
%token <id>T_DEPENDS
-%token <id>T_REQUIRES
%token <id>T_OPTIONAL
%token <id>T_PROMPT
%token <id>T_TYPE
@@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL
{
menu_add_dep($3);
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
-}
- | T_DEPENDS expr T_EOL
-{
- menu_add_dep($2);
- printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
-}
- | T_REQUIRES expr T_EOL
-{
- menu_add_dep($2);
- printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
};
/* prompt statement */