summaryrefslogtreecommitdiff
path: root/v4l/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:48:29 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:48:29 -0200
commit6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b (patch)
tree7e1fac27df4358a4ffb22c41d5039ef35260239e /v4l/Makefile
parent3163e57be54a44818c4bdaafa54f1f5a23dd5f4f (diff)
parenta47be5953c72392a7be1efafc70621242275f08f (diff)
downloadmediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.gz
mediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/Makefile')
-rw-r--r--v4l/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index b07b592b1..f08143def 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -102,8 +102,12 @@ EXTRA_CFLAGS += -g
EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
+# Make sure kernel's options are overridden by v4l-dvb options
EXTRA_CFLAGS += -include $(obj)/config-compat.h
+# Allow kernel version compat tests without adding #include's
+EXTRA_CFLAGS += -include linux/version.h
+
#################################################
# Kernel 2.4/2.6 specific rules