diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 13:29:24 -0700 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 13:29:24 -0700 |
commit | a19809875fb0952631767e2d2484bcd81b4365a1 (patch) | |
tree | f922fe27fd150560b079a5a140c8c7a5f39ca9ac /sound/soc/codecs/sn95031.c | |
parent | 70da1dc052349b75a91fea1198258c99cea03390 (diff) | |
parent | 39cca168bdfaef9d0c496ec27f292445d6184946 (diff) | |
download | op-kernel-dev-a19809875fb0952631767e2d2484bcd81b4365a1.zip op-kernel-dev-a19809875fb0952631767e2d2484bcd81b4365a1.tar.gz |
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 569555f..f70977d 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -918,7 +918,7 @@ static struct platform_driver sn95031_codec_driver = { .owner = THIS_MODULE, }, .probe = sn95031_device_probe, - .remove = sn95031_device_remove, + .remove = __devexit_p(sn95031_device_remove), }; static int __init sn95031_init(void) |