From c94eede342d36bb236464419bc6014fa12d4d843 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 19 Feb 2009 21:26:11 +0100 Subject: v4l-dvb: work around an autoconf.h include in mmdebug.h From: Hans Verkuil mmdebug.h (included by mm.h) includes autoconf.h in turn. This will overwrite the local v4l config with the kernel's config. If this header is present, then include it in the generated config-compat.h before we set our local v4l config. This way it won't be included again later. mmdebug.h appeared in 2.6.28. Priority: normal Signed-off-by: Hans Verkuil --- v4l/scripts/make_config_compat.pl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index d24b5f718..423dcff77 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -277,6 +277,13 @@ open IN, "<$infile" or die "File not found: $infile"; $out.= "#ifndef __CONFIG_COMPAT_H__\n"; $out.= "#define __CONFIG_COMPAT_H__\n\n"; $out.= "#include \n\n"; + +# mmdebug.h includes autoconf.h. So if this header exists, +# then include it before our config is set. +if (-f "$kdir/include/linux/mmdebug.h") { + $out.= "#include \n\n"; +} + while() { next unless /^(\S+)\s*:= (\S+)$/; $out.= "#undef $1\n"; -- cgit v1.2.3