diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /sound/soc/mid-x86 | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'sound/soc/mid-x86')
-rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index 9ebe027f69e7..d567c322a2fb 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c | |||
@@ -442,7 +442,7 @@ static int sst_platform_remove(struct platform_device *pdev) | |||
442 | 442 | ||
443 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); | 443 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); |
444 | snd_soc_unregister_platform(&pdev->dev); | 444 | snd_soc_unregister_platform(&pdev->dev); |
445 | pr_debug("sst_platform_remove sucess\n"); | 445 | pr_debug("sst_platform_remove success\n"); |
446 | return 0; | 446 | return 0; |
447 | } | 447 | } |
448 | 448 | ||
@@ -465,7 +465,7 @@ module_init(sst_soc_platform_init); | |||
465 | static void __exit sst_soc_platform_exit(void) | 465 | static void __exit sst_soc_platform_exit(void) |
466 | { | 466 | { |
467 | platform_driver_unregister(&sst_platform_driver); | 467 | platform_driver_unregister(&sst_platform_driver); |
468 | pr_debug("sst_soc_platform_exit sucess\n"); | 468 | pr_debug("sst_soc_platform_exit success\n"); |
469 | } | 469 | } |
470 | module_exit(sst_soc_platform_exit); | 470 | module_exit(sst_soc_platform_exit); |
471 | 471 | ||