Linux 3.0-rc1-30-g2a11c8e introduced the macros IS_ENABLED, IS_BUILTIN and IS_MODULE that can be used to identify which state a tristate option had. The compat-autoconf.h needs to provide additional precompiler variables that these marcros can use.

Signed-off-by: Sven Eckelmann sven@narfation.org --- gen-compat-autoconf.sh | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 440accc..1a020c1 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -12,15 +12,22 @@ gen_config() { VALUE="${2}"

echo "#undef ${KEY}" + echo "#undef __enabled_${KEY}" + echo "#undef __enabled_${KEY}_MODULE" case "${VALUE}" in y) echo "#define ${KEY} 1" + echo "#define __enabled_${KEY} 1" + echo "#define __enabled_${KEY}_MODULE 0" ;; m) echo "#define ${KEY} 1" + echo "#define __enabled_${KEY} 0" + echo "#define __enabled_${KEY}_MODULE 1" ;; n) - # leave it undefined + echo "#define __enabled_${KEY} 0" + echo "#define __enabled_${KEY}_MODULE 0" ;; *) echo "#define ${KEY} "${VALUE}""