aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs42l52.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-12-10 03:00:45 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-10 03:00:45 -0500
commit97768a8e658605a905ba0d908d1b23b475170bed (patch)
tree0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/codecs/cs42l52.c
parent9621055fbbb190264cb6a8182b70e3f0f917d770 (diff)
parent7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff)
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8 Some incremental updates, nothing too exciting. The biggest block here is the __dev annotation removal stuff from Bill, everything else is the usual driver-specific stuff - a combination of fixes and development. There will be at least more more set of fixes to come but I wanted to get these out ready for the merge window to make sure Bill's stuff makes it in.
Diffstat (limited to 'sound/soc/codecs/cs42l52.c')
-rw-r--r--sound/soc/codecs/cs42l52.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 97a81051e88d..99bb1c69499e 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1271,7 +1271,7 @@ static struct i2c_driver cs42l52_i2c_driver = {
1271 }, 1271 },
1272 .id_table = cs42l52_id, 1272 .id_table = cs42l52_id,
1273 .probe = cs42l52_i2c_probe, 1273 .probe = cs42l52_i2c_probe,
1274 .remove = __devexit_p(cs42l52_i2c_remove), 1274 .remove = cs42l52_i2c_remove,
1275}; 1275};
1276 1276
1277module_i2c_driver(cs42l52_i2c_driver); 1277module_i2c_driver(cs42l52_i2c_driver);