summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/confdata.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-07 21:09:55 +0100
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 23:14:38 +0100
commitd6ee35764f270c699e165b15dc59f4e55546bfda (patch)
tree021bd7249f0aeaa8280c83c938bd5755ecc9c65a /scripts/kconfig/confdata.c
parentd84876f9f8042d5536050b83674c4f348ca3c4df (diff)
downloadlinux-d6ee35764f270c699e165b15dc59f4e55546bfda.tar.gz
linux-d6ee35764f270c699e165b15dc59f4e55546bfda.tar.bz2
linux-d6ee35764f270c699e165b15dc59f4e55546bfda.zip
kconfig: rename E_OR & friends to avoid name clash
We had macros named the same as a set of enumeration values. It is legal code but very confusing to read - so rename the macros from E_* to EXPR_* Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Roman Zippel <zippel@linux-m68k.org>
Diffstat (limited to 'scripts/kconfig/confdata.c')
-rw-r--r--scripts/kconfig/confdata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2eccefb03a93..497a19e85a07 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -300,7 +300,7 @@ load:
cs->def[def].val = sym;
break;
}
- cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri);
+ cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
}
}
fclose(in);