diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 21:26:11 +0100 |
---|---|---|
committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-19 21:26:11 +0100 |
commit | c94eede342d36bb236464419bc6014fa12d4d843 (patch) | |
tree | 3104d91d7fd8da9fc4c8e057b1824ae5c01bfc5e /v4l/scripts/make_config_compat.pl | |
parent | c0d72775f8fc3a3e551f233b3501ccf1ca23fe2a (diff) | |
download | mediapointer-dvb-s2-c94eede342d36bb236464419bc6014fa12d4d843.tar.gz mediapointer-dvb-s2-c94eede342d36bb236464419bc6014fa12d4d843.tar.bz2 |
v4l-dvb: work around an autoconf.h include in mmdebug.h
From: Hans Verkuil <hverkuil@xs4all.nl>
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 <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l/scripts/make_config_compat.pl')
-rwxr-xr-x | v4l/scripts/make_config_compat.pl | 7 |
1 files changed, 7 insertions, 0 deletions
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 <linux/autoconf.h>\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 <linux/mmdebug.h>\n\n"; +} + while(<IN>) { next unless /^(\S+)\s*:= (\S+)$/; $out.= "#undef $1\n"; |