summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 20:52:03 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 20:52:03 -0200
commitde00985e053e5742126ccd5299ac49047fecec88 (patch)
tree552032607812c7512db3b0a271ee76c2d43626d5 /v4l
parent942a41fc50cf6a55b959fd4470ce7a1ace120dfb (diff)
parentc475839553c110df9e43e58998cd37d05a34de20 (diff)
downloadmediapointer-dvb-s2-de00985e053e5742126ccd5299ac49047fecec88.tar.gz
mediapointer-dvb-s2-de00985e053e5742126ccd5299ac49047fecec88.tar.bz2
merge: http://linuxtv.org/hg/~anttip/af9015/
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"