From patchwork Thu Feb 14 22:26:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2143351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 034F03FCF6 for ; Thu, 14 Feb 2013 22:31:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U67Ix-0002Vz-RL; Thu, 14 Feb 2013 22:29:23 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U67Gs-0001YG-O2 for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 22:27:17 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MDCrg-1U7CeV0qYm-00GpAk; Thu, 14 Feb 2013 23:27:07 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 8/9] [media] s5p-fimc: fix s5pv210 build Date: Thu, 14 Feb 2013 23:26:57 +0100 Message-Id: <1360880818-4071454-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360880818-4071454-1-git-send-email-arnd@arndb.de> References: <1360880818-4071454-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:r8gJDXL6Mag5ieF7gw1qR2d9Y9SCbD4Ry/uJdlI4F+y M0wsQXPD2lCRqyFUDfGVXwXgKxdi4gHEHSysg+xRbkK87rRXFe ZWq55yvDInhoqAKhZ8KXwkMMBdgt3JSv6JEhShTMAe258pZJJb Zp1le0nJHvzA+A6lFzDaQ/Y4LHve2WXD9MdnJC1Ltkqvy/va6O dztBUl7mwDlUplc56+sg8ftAGloWHNQY6xq68fHvnXtFej7kZE 2NCV15KRGivytdiP5kZQwpqkfo+KMGyS01uQ/py+TPfuuKRnz6 ZXbUKEav+ws1Gn7fpOz9R45qxymVLJwpq7KcuPhFbiyCYWU7jq KF8ez2J9aYGDHYCsqa89KMozVvTTTEU65fFDA+8tZ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_172715_034219_27651F88 X-CRM114-Status: GOOD ( 11.80 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim , Mauro Carvalho Chehab , Arnd Bergmann , linux-kernel@vger.kernel.org, Kyungmin Park , Sylwester Nawrocki X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 56bc911 "[media] s5p-fimc: Redefine platform data structure for fimc-is" changed the bus_type member of struct fimc_source_info treewide, but got one instance wrong in mach-s5pv210, which was evidently not even build tested. This adds the missing change to get s5pv210_defconfig to build again. Applies on the Mauro's media tree. Signed-off-by: Arnd Bergmann Cc: Sylwester Nawrocki Cc: Kyungmin Park Cc: Kukjin Kim Cc: Mauro Carvalho Chehab --- arch/arm/mach-s5pv210/mach-goni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 3a38f7b..e373de4 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = { .mux_id = 0, .flags = V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_VSYNC_ACTIVE_LOW, - .bus_type = FIMC_BUS_TYPE_ITU_601, + .fimc_bus_type = FIMC_BUS_TYPE_ITU_601, .board_info = &noon010pc30_board_info, .i2c_bus_num = 0, .clk_frequency = 16000000UL,