From patchwork Thu May 5 15:56:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 757582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p45Fuc3N013823 for ; Thu, 5 May 2011 15:56:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755259Ab1EEP4o (ORCPT ); Thu, 5 May 2011 11:56:44 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:61204 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751714Ab1EEP4n (ORCPT ); Thu, 5 May 2011 11:56:43 -0400 Received: from axis700.grange (pD9EB90E6.dip0.t-ipconnect.de [217.235.144.230]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Mb5Kx-1Q2GXv1qhP-00KX3V; Thu, 05 May 2011 17:56:28 +0200 Received: by axis700.grange (Postfix, from userid 1000) id E685D189B89; Thu, 5 May 2011 17:56:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id DD323189B88; Thu, 5 May 2011 17:56:27 +0200 (CEST) Date: Thu, 5 May 2011 17:56:27 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: Simon Horman , Magnus Damm Subject: [PATCH 1/2] ARM: mach-shmobile: MMCIF on mackerel can also be a module Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:8KMP2A7+FC0TsqLi8W43vfCyzsfBX5zM83CDx3XtEgY RETRkvip91m2In3ilAexPVCyXjKcdWJusFxe7443mRaJbp4yzQ 8st/9ZcPdgDRy3+8s7ZqujhQNLjkAdxclPY4dJDLdhcknZWmGT knDAZYfL0eCHVGYXPlRDsgMikAg3ukKN9uGkQgxpt8PqsOccqi 6dYlTH16Q0elP5JEd+Pd83XPSyu9++dJBWsK3G8vl4= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 05 May 2011 15:56:44 +0000 (UTC) Remember to also check for the CONFIG_MMC_SH_MMCIF_MODULE option for the case of a modular MMCIF driver. Signed-off-by: Guennadi Liakhovetski Reviewed-by: Simon Horman --- arch/arm/mach-shmobile/board-mackerel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 53fe219..8fe1f00 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -705,7 +705,7 @@ static struct platform_device sdhi0_device = { }, }; -#if !defined(CONFIG_MMC_SH_MMCIF) +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) /* SDHI1 */ static struct sh_mobile_sdhi_info sdhi1_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, @@ -940,7 +940,7 @@ static struct platform_device *mackerel_devices[] __initdata = { &fsi_ak4643_device, &fsi_hdmi_device, &sdhi0_device, -#if !defined(CONFIG_MMC_SH_MMCIF) +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) &sdhi1_device, #endif &sdhi2_device, @@ -1140,7 +1140,7 @@ static void __init mackerel_init(void) gpio_request(GPIO_FN_SDHID0_1, NULL); gpio_request(GPIO_FN_SDHID0_0, NULL); -#if !defined(CONFIG_MMC_SH_MMCIF) +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) /* enable SDHI1 */ gpio_request(GPIO_FN_SDHICMD1, NULL); gpio_request(GPIO_FN_SDHICLK1, NULL);