From 61afb577b049c0038d8d9acb2d2d14a38f867f64 Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Tue, 9 Aug 2011 16:27:24 +0000 Subject: [PATCH] --- yaml --- r: 273367 b: refs/heads/master c: 3c6e36537e40a41ddb0e27a80149cfd341a92d7d h: refs/heads/master i: 273365: 2407fc2a76b5d0a70c63a6a9d981827e0ae21c65 273363: c0137b4d0cd6159fe1e1cfc00a4ee5d7bf7cc32e 273359: cfad3d1bba09d0555daf7433db342f0e2ff05bdb v: v3 --- [refs] | 2 +- trunk/drivers/mfd/asic3.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab59410a1c3b..c2106091028c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1693673fc003d3d5f80ae34b21e0480a1d8a36e3 +refs/heads/master: 3c6e36537e40a41ddb0e27a80149cfd341a92d7d diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index c71ae09430c5..5ac2961fedfe 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -779,6 +779,8 @@ static struct mfd_cell asic3_cell_mmc = { .name = "tmio-mmc", .enable = asic3_mmc_enable, .disable = asic3_mmc_disable, + .suspend = asic3_mmc_disable, + .resume = asic3_mmc_enable, .platform_data = &asic3_mmc_data, .pdata_size = sizeof(asic3_mmc_data), .num_resources = ARRAY_SIZE(asic3_mmc_resources),