From patchwork Mon Oct 1 20:52:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1532621 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 28906E003B for ; Mon, 1 Oct 2012 20:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932233Ab2JAUwv (ORCPT ); Mon, 1 Oct 2012 16:52:51 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:33291 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932232Ab2JAUwu (ORCPT ); Mon, 1 Oct 2012 16:52:50 -0400 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3XVwg215zTz4KK8y; Mon, 1 Oct 2012 22:52:46 +0200 (CEST) X-Auth-Info: gBUEQNPJo8DSxBOKysqs10Sh608xD0AO14E/+hntKcg= Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3XVwg16h8yzbbg5; Mon, 1 Oct 2012 22:52:45 +0200 (CEST) From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: linux-mmc@vger.kernel.org, Marek Vasut , Fabio Estevam , Shawn Guo Subject: [PATCH] mmc: mxs-mmc: Fix merge issue causing build error Date: Mon, 1 Oct 2012 22:52:43 +0200 Message-Id: <1349124763-10840-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The following error appeared due to trivial merge problem: drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'base' drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'devid' make[3]: *** [drivers/mmc/host/mxs-mmc.o] Error 1 This patches corrects the issue. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Shawn Guo --- drivers/mmc/host/mxs-mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index bb4c2bf..80d1e6d 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); writel(BM_SSP_CTRL1_SDIO_IRQ_EN, - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); } else { writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);