From patchwork Tue Mar 5 22:16:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2222421 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 79AF13FCF6 for ; Tue, 5 Mar 2013 22:20:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UD0BD-0008MH-6f; Tue, 05 Mar 2013 22:17:51 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UD0AK-00085O-T9 for linux-arm-kernel@lists.infradead.org; Tue, 05 Mar 2013 22:16:58 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LaHU2-1Ue2O91Jh0-00m4zi; Tue, 05 Mar 2013 23:16:47 +0100 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build Date: Tue, 5 Mar 2013 23:16:47 +0100 Message-Id: <1362521809-22989-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362521809-22989-1-git-send-email-arnd@arndb.de> References: <1362521809-22989-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:MGP+QcStZ8BBElqkHPw+0WoeA2pXbQ+rNpfU5Cfwi7Q VeiLBSgviUB1ywdW0m8ZAMYdGTnHs0W3YmOCgRzrub0RjKovZ/ OeicMmgZeB/ETue22/lqzekXeEA00n3rz9qV2R78vYjdhDcpe8 CgWNdn3av8q6rUC9Af0EEQLiU82jskFPMZfWjiRaqROzWwrBu9 EToXiwQYWRsj3vh2AKRay1m3gSuCCu6PlEY4+1fUheG5SzAb6y 9N2BGgIMP8HEyLyFG7rvNnAO9cSWN3vfhYvH4/dDzdDfTjWcyk OF2ZSvoW/BPJIRFG+fAbl8GMEuY4MeTlZcj0fGr96b4JOwQWv1 77/XsSq229briU33c6C5Rh1FtdergfVL1+iTSWEyM X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130305_171657_185901_0D71C645 X-CRM114-Status: GOOD ( 11.25 ) 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.171 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 , Kyungmin Park , arm@kernel.org, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" 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 Acked-by: Kukjin Kim --- 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,