diff mbox

media_build: Add support for kernel 3.x, remove support for kernel 2.4

Message ID 201107252030.58897@orion.escape-edv.de (mailing list archive)
State Accepted
Headers show

Commit Message

Oliver Endriss July 25, 2011, 6:30 p.m. UTC 
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
diff mbox

Patch

diff -r 7830053e4245 v4l/Makefile
--- a/v4l/Makefile	Mon Jul 18 22:25:39 2011 +0200
+++ b/v4l/Makefile	Mon Jul 25 20:05:51 2011 +0200
@@ -135,21 +135,11 @@ 
 EXTRA_CFLAGS += -include $(obj)/compat.h
 
 #################################################
-# Kernel 2.4/2.6 specific rules
+# Kernel 2.6/3.x specific rules
 
 ifneq ($(KERNELRELEASE),)
-
-ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  export-objs	:=
  list-multi	:=
-else
-include $(obj)/Makefile.kern24
-
- multi-m	:= $(filter $(list-multi), $(obj-m))
- int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
- export-objs	:= $(filter $(int-m) $(obj-m),$(export-objs))
-endif
-
 endif
 
 #################################################
@@ -171,19 +161,15 @@ 
 HOSTCC:=$(CC)
 CC += -I$(obj)
 
-ifeq ($(VERSION).$(PATCHLEVEL),2.6)
- CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/
+CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/
 
- # Needed for kernel 2.6.24 or up
- KBUILD_CPPFLAGS := -I$(SUBDIRS)/../linux/include $(KBUILD_CPPFLAGS) -I$(SUBDIRS)/
+# 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)/
+# 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"
-endif
+MYCFLAGS :=
 
 
 #################################################