diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 16:29:24 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 16:29:24 -0400 |
| commit | a19809875fb0952631767e2d2484bcd81b4365a1 (patch) | |
| tree | f922fe27fd150560b079a5a140c8c7a5f39ca9ac /sound/soc/codecs/sn95031.c | |
| parent | 70da1dc052349b75a91fea1198258c99cea03390 (diff) | |
| parent | 39cca168bdfaef9d0c496ec27f292445d6184946 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc/codecs/sn95031.c')
| -rw-r--r-- | sound/soc/codecs/sn95031.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index 569555f4a92f..f70977d7dbe6 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c | |||
| @@ -918,7 +918,7 @@ static struct platform_driver sn95031_codec_driver = { | |||
| 918 | .owner = THIS_MODULE, | 918 | .owner = THIS_MODULE, |
| 919 | }, | 919 | }, |
| 920 | .probe = sn95031_device_probe, | 920 | .probe = sn95031_device_probe, |
| 921 | .remove = sn95031_device_remove, | 921 | .remove = __devexit_p(sn95031_device_remove), |
| 922 | }; | 922 | }; |
| 923 | 923 | ||
| 924 | static int __init sn95031_init(void) | 924 | static int __init sn95031_init(void) |