From patchwork Mon Jul 25 18:30:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Endriss X-Patchwork-Id: 1005762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6PIY3XC012839 for ; Mon, 25 Jul 2011 18:34:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353Ab1GYSeB (ORCPT ); Mon, 25 Jul 2011 14:34:01 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:34612 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751430Ab1GYSeB (ORCPT ); Mon, 25 Jul 2011 14:34:01 -0400 Received: (qmail invoked by alias); 25 Jul 2011 18:33:58 -0000 Received: from unknown (HELO charon.escape-edv.de) [93.216.239.81] by mail.gmx.net (mp044) with SMTP; 25 Jul 2011 20:33:58 +0200 X-Authenticated: #476490 X-Provags-ID: V01U2FsdGVkX1+IrTIEbcKI5ULcP6mgYo6/be/b8omugfbeuFVXE3 OSJRgC+RXknpAk Received: from orion.escape-edv.de (192.168.1.10) by charon.escape-edv.de (192.168.1.9) with esmtp ; Mon, 25 Jul 2011 20:33:33 +0200 From: Oliver Endriss Reply-To: linux-media@vger.kernel.org Organization: ESCAPE GmbH EDV-Loesungen To: linux-media@vger.kernel.org Subject: [Patch] media_build: Add support for kernel 3.x, remove support for kernel 2.4 Date: Mon, 25 Jul 2011 20:30:58 +0200 User-Agent: KMail/1.9.6 Cc: Mauro Carvalho Chehab MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201107252030.58897@orion.escape-edv.de> X-Y-GMX-Trusted: 0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 25 Jul 2011 18:34:04 +0000 (UTC) Signed-off-by: Oliver Endriss 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 := #################################################