OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'slab/next' into for-linus
[android-x86/kernel.git]
/
sound
/
soc
/
sh
/
ssi.c
diff --git
a/sound/soc/sh/ssi.c
b/sound/soc/sh/ssi.c
index
40bbdf1
..
05192d9
100644
(file)
--- a/
sound/soc/sh/ssi.c
+++ b/
sound/soc/sh/ssi.c
@@
-387,7
+387,7
@@
static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)
static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)
{
- snd_soc_unregister_dai(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+ snd_soc_unregister_dai
s
(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
return 0;
}