Merge branch 'master' into fixes

diff --combined sound/soc/nuc900/nuc900-ac97.c
index 80ff85934a1f08ce1b101b84930d573b85bc32c3,45d11ddaeea9110a66182eaaa18047c8465ff90b..946020a647db2e1d5eec71f82fb9a3c936ced546
--- 1/sound/soc/nuc900/nuc900-ac97.c
--- 2/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@@ -291,7 -291,7 +291,7 @@@ static int nuc900_ac97_remove(struct sn
        return 0;
  }
  
- static struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
+ static const struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
        .trigger        = nuc900_ac97_trigger,
  };
  
@@@ -366,7 -366,7 +366,7 @@@ static int __devinit nuc900_ac97_drvpro
                goto out3;
  
        /* enbale ac97 multifunction pin */
 -      mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");
 +      mfp_set_groupg(nuc900_audio->dev, NULL);
  
        return 0;
  
@@@ -406,18 -406,7 +406,7 @@@ static struct platform_driver nuc900_ac
        .remove         = __devexit_p(nuc900_ac97_drvremove),
  };
  
- static int __init nuc900_ac97_init(void)
- {
-       return platform_driver_register(&nuc900_ac97_driver);
- }
- 
- static void __exit nuc900_ac97_exit(void)
- {
-       platform_driver_unregister(&nuc900_ac97_driver);
- }
- 
- module_init(nuc900_ac97_init);
- module_exit(nuc900_ac97_exit);
+ module_platform_driver(nuc900_ac97_driver);
  
  MODULE_AUTHOR("Wan ZongShun <[email protected]>");
  MODULE_DESCRIPTION("NUC900 AC97 SoC driver!");