From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 11 Dec 2011 03:24:44 +0000 (+0800)
Subject: Merge branch 'for-3.2' into for-3.3
X-Git-Tag: upstream/snapshot3+hdmi~7307^2~265
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43a95197581ac58081772eab3bd5f114da87f98b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/mxs/mxs-pcm.c
---

43a95197581ac58081772eab3bd5f114da87f98b
diff --cc sound/soc/mxs/mxs-pcm.c
index 612ad3d,f39d7dd..0e12f4e
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@@ -346,4 -346,17 +346,7 @@@ static struct platform_driver mxs_pcm_d
  	.remove = __devexit_p(mxs_soc_platform_remove),
  };
  
 -static int __init snd_mxs_pcm_init(void)
 -{
 -	return platform_driver_register(&mxs_pcm_driver);
 -}
 -module_init(snd_mxs_pcm_init);
 -
 -static void __exit snd_mxs_pcm_exit(void)
 -{
 -	platform_driver_unregister(&mxs_pcm_driver);
 -}
 -module_exit(snd_mxs_pcm_exit);
 +module_platform_driver(mxs_pcm_driver);
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:mxs-pcm-audio");