diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/txx9 | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/txx9')
| -rw-r--r-- | sound/soc/txx9/txx9aclc-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/txx9/txx9aclc-generic.c b/sound/soc/txx9/txx9aclc-generic.c index 6770e7166be4..9b5e283af51c 100644 --- a/sound/soc/txx9/txx9aclc-generic.c +++ b/sound/soc/txx9/txx9aclc-generic.c | |||
| @@ -62,7 +62,7 @@ static int __exit txx9aclc_generic_remove(struct platform_device *pdev) | |||
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static struct platform_driver txx9aclc_generic_driver = { | 64 | static struct platform_driver txx9aclc_generic_driver = { |
| 65 | .remove = txx9aclc_generic_remove, | 65 | .remove = __exit_p(txx9aclc_generic_remove), |
| 66 | .driver = { | 66 | .driver = { |
| 67 | .name = "txx9aclc-generic", | 67 | .name = "txx9aclc-generic", |
| 68 | .owner = THIS_MODULE, | 68 | .owner = THIS_MODULE, |