summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 18:06:44 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 18:06:44 -0200
commitfceb8e0cafa24afb15f841c14fbe802e42c13dfe (patch)
tree7645da02cedb035f5f3b4883f59b529524070a32 /v4l
parent8c0898eba0b293726f0d339021c14fcbcb7157af (diff)
parent8e61aa005719a9c2c7a8a1b8d0f99da2706b4030 (diff)
downloadmediapointer-dvb-s2-fceb8e0cafa24afb15f841c14fbe802e42c13dfe.tar.gz
mediapointer-dvb-s2-fceb8e0cafa24afb15f841c14fbe802e42c13dfe.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146-2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index f96873227..4406fdfff 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -159,9 +159,12 @@ CC += -I$(obj)
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/
- # Needed for kernel 2.6.24 or upper
+ # Needed for kernel 2.6.24 or up
KBUILD_CPPFLAGS := -I$(SUBDIRS)/../linux/include $(KBUILD_CPPFLAGS) -I$(SUBDIRS)/
+ # Needed for kernel 2.6.29 or up
+ LINUXINCLUDE := -I$(SUBDIRS)/../linux/include $(LINUXINCLUDE) -I$(SUBDIRS)/
+
MYCFLAGS :=
else
MYCFLAGS := CFLAGS="-I../linux/include -D__KERNEL__ -I$(KDIR)/include -DEXPORT_SYMTAB"