xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fixes

Browse Source
This commit is contained in:
Russell King
2012-01-13 15:00:22 +00:00
parent 294064f589 099469502f
commit 4de3a8e101
5104 changed files with 211089 additions and 114918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/nuc900/nuc900-ac97.c
View File

@@ -291,7 +291,7 @@ static int nuc900_ac97_remove(struct snd_soc_dai *dai)
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,
};
@@ -406,18 +406,7 @@ static struct platform_driver nuc900_ac97_driver = {
.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 <mcuos.com@gmail.com>");
MODULE_DESCRIPTION("NUC900 AC97 SoC driver!");

1
sound/soc/nuc900/nuc900-audio.c
View File

@@ -32,6 +32,7 @@ static struct snd_soc_dai_link nuc900evb_ac97_dai = {
static struct snd_soc_card nuc900evb_audio_machine = {
.name = "NUC900EVB_AC97",
.owner = THIS_MODULE,
.dai_link = &nuc900evb_ac97_dai,
.num_links = 1,
};

12
sound/soc/nuc900/nuc900-pcm.c
View File

@@ -358,17 +358,7 @@ static struct platform_driver nuc900_pcm_driver = {
.remove = __devexit_p(nuc900_soc_platform_remove),
};
static int __init nuc900_pcm_init(void)
{
return platform_driver_register(&nuc900_pcm_driver);
}
module_init(nuc900_pcm_init);
static void __exit nuc900_pcm_exit(void)
{
platform_driver_unregister(&nuc900_pcm_driver);
}
module_exit(nuc900_pcm_exit);
module_platform_driver(nuc900_pcm_driver);
MODULE_AUTHOR("Wan ZongShun, <mcuos.com@gmail.com>");
MODULE_DESCRIPTION("nuc900 Audio DMA module");