lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 147/196] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505 upstream.

    This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix
    all hangs related to mmc/sd card insert/removal during suspend/resume")

    Cc: David Brownell <david-b@pacbell.net>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: linux-mmc@vger.kernel.org
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Kukjin Kim <kgene.kim@samsung.com>
    Acked-by: Maxim Levitsky <maximlevitsky@gmail.com>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/mmc/core/host.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
    index 0efe631..d80cfdc 100644
    --- a/drivers/mmc/core/host.c
    +++ b/drivers/mmc/core/host.c
    @@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
    init_waitqueue_head(&host->wq);
    INIT_DELAYED_WORK(&host->detect, mmc_rescan);
    INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable);
    +#ifdef CONFIG_PM
    host->pm_notify.notifier_call = mmc_pm_notify;
    +#endif

    /*
    * By default, hosts do not support SGIO or large requests.
    --
    1.7.9.3
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-03-13 01:37    [W:3.696 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site