linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
@ 2012-05-21  4:33 Marek Vasut
  2012-06-06 14:17 ` Chris Ball
  0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2012-05-21  4:33 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: linux-mmc at vger.kernel.org
Cc: Chris Ball <cjb@laptop.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
---
 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 34a9026..277161d 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = {
 		.owner	= THIS_MODULE,
 #ifdef CONFIG_PM
 		.pm	= &mxs_mmc_pm_ops,
-		.of_match_table = mxs_mmc_dt_ids,
 #endif
+		.of_match_table = mxs_mmc_dt_ids,
 	},
 };
 
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
  2012-05-21  4:33 [PATCH] mmc: mxs-mmc: Move of_match_table out of CONFIG_PM Marek Vasut
@ 2012-06-06 14:17 ` Chris Ball
  2012-06-06 15:37   ` Marek Vasut
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Ball @ 2012-06-06 14:17 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On Mon, May 21 2012, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: linux-mmc at vger.kernel.org
> Cc: Chris Ball <cjb@laptop.org>
> Acked-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  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 34a9026..277161d 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = {
>  		.owner	= THIS_MODULE,
>  #ifdef CONFIG_PM
>  		.pm	= &mxs_mmc_pm_ops,
> -		.of_match_table = mxs_mmc_dt_ids,
>  #endif
> +		.of_match_table = mxs_mmc_dt_ids,
>  	},
>  };

Thanks, pushed to mmc-next for 3.5.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
  2012-06-06 14:17 ` Chris Ball
@ 2012-06-06 15:37   ` Marek Vasut
  0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2012-06-06 15:37 UTC (permalink / raw)
  To: linux-arm-kernel

Dear Chris Ball,

> Hi,
> 
> On Mon, May 21 2012, Marek Vasut wrote:
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: linux-mmc at vger.kernel.org
> > Cc: Chris Ball <cjb@laptop.org>
> > Acked-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> > 
> >  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 34a9026..277161d 100644
> > --- a/drivers/mmc/host/mxs-mmc.c
> > +++ b/drivers/mmc/host/mxs-mmc.c
> > @@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = {
> > 
> >  		.owner	= THIS_MODULE,
> >  
> >  #ifdef CONFIG_PM
> >  
> >  		.pm	= &mxs_mmc_pm_ops,
> > 
> > -		.of_match_table = mxs_mmc_dt_ids,
> > 
> >  #endif
> > 
> > +		.of_match_table = mxs_mmc_dt_ids,
> > 
> >  	},
> >  
> >  };
> 
> Thanks, pushed to mmc-next for 3.5.

Thanks!

> - Chris.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-06-06 15:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21  4:33 [PATCH] mmc: mxs-mmc: Move of_match_table out of CONFIG_PM Marek Vasut
2012-06-06 14:17 ` Chris Ball
2012-06-06 15:37   ` Marek Vasut

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).