Merge branch 'for-3.2' into for-3.3

[deliverable/linux.git] / sound / soc / codecs / wm8974.c

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index a5fd017c43324bee8672de93008336d0ea4f7855..4a6a7b5a61ba442583cce6d1d6e6338836130f70 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -671,7 +671,7 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id);
 
 static struct i2c_driver wm8974_i2c_driver = {
        .driver = {
-               .name = "wm8974-codec",
+               .name = "wm8974",
                .owner = THIS_MODULE,
        },
        .probe =    wm8974_i2c_probe,