diff options
-rw-r--r-- | v4l/Makefile | 3 | ||||
-rw-r--r-- | v4l/compat.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 7674abd98..b07b592b1 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -102,6 +102,8 @@ EXTRA_CFLAGS += -g EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL) +EXTRA_CFLAGS += -include $(obj)/config-compat.h + ################################################# # Kernel 2.4/2.6 specific rules @@ -241,6 +243,7 @@ config-compat.h:: .myconfig -e 'while(<>) {' \ -e ' next unless /^(\S+)\s*:= (\S+)$$/;' \ -e ' print "#undef $$1\n";' \ + -e ' print "#undef $$1_MODULE\n";' \ -e ' if($$2 eq "n") { next; }' \ -e ' elsif($$2 eq "m") { print "#define $$1_MODULE 1\n"; }' \ -e ' elsif($$2 eq "y") { print "#define $$1 1\n"; }' \ diff --git a/v4l/compat.h b/v4l/compat.h index 4b5f597fb..6ba49e825 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -10,7 +10,6 @@ #include <linux/version.h> #include <linux/utsname.h> #include <linux/sched.h> -#include "config-compat.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) # define minor(x) MINOR(x) |