From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.kundenserver.de ([212.227.126.131]:56114 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755968AbaFLOQI (ORCPT ); Thu, 12 Jun 2014 10:16:08 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Laurent Pinchart , Nishanth Menon , Tony Lindgren , gregkh@linuxfoundation.org, Mauro Carvalho Chehab , arm@kernel.org, linux-omap@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [PATCH] [media] staging: allow omap4iss to be modular Date: Thu, 12 Jun 2014 16:15:32 +0200 Message-ID: <7460455.eZRbtzsNrd@wuerfel> In-Reply-To: <2046469.GckHavNRr1@avalon> References: <5192928.MkINji4uKU@wuerfel> <7948240.P51u2omQa4@wuerfel> <2046469.GckHavNRr1@avalon> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: On Thursday 12 June 2014 16:12:17 Laurent Pinchart wrote: > > From 3a965f4fd5a6b3ef4a66aa4e7c916cfd34fd5706 Mon Sep 17 00:00:00 2001 > > From: Arnd Bergmann > > Date: Tue, 21 Jan 2014 09:32:43 +0100 > > Subject: [PATCH] [media] staging: tighten omap4iss dependencies > > > > The OMAP4 camera support depends on I2C and VIDEO_V4L2, both > > of which can be loadable modules. This causes build failures > > if we want the camera driver to be built-in. > > > > This can be solved by turning the option into "tristate", > > which unfortunately causes another problem, because the > > driver incorrectly calls a platform-internal interface > > for omap4_ctrl_pad_readl/omap4_ctrl_pad_writel. > > > > Instead, this patch just forbids the invalid configurations > > and ensures that the driver can only be built if all its > > dependencies are built-in. > > > > Signed-off-by: Arnd Bergmann > > Acked-by: Laurent Pinchart > > Should I take this in my tree for v3.17 or would you like to fast-track it ? > I'd actually like to see it in 3.15 as a stable backport if possible, but definitely in 3.16. What is the normal path for staging/media but fix patches? Arnd