aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-02-11 12:29:51 +0100
committerKalimochoAz <calimochoazucarado@gmail.com>2012-02-11 12:29:51 +0100
commit3e0951a2a1399cf402ac783910cf272655b3f78a (patch)
treec94ed3ae2cdcc611e2dd044f835845715db2831a
parent5dd09e4e5e3da04315fe6c345195dbc530868909 (diff)
parent7e9ea84d44cbe5dd65a9e24db9135cdfe8f4f9b8 (diff)
downloadkernel_samsung_crespo-3e0951a2a1399cf402ac783910cf272655b3f78a.zip
kernel_samsung_crespo-3e0951a2a1399cf402ac783910cf272655b3f78a.tar.gz
kernel_samsung_crespo-3e0951a2a1399cf402ac783910cf272655b3f78a.tar.bz2
Merge branch 'cm.ics.voodoo_sound' into cm.ics.new
-rw-r--r--sound/soc/codecs/wm8994_voodoo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994_voodoo.c b/sound/soc/codecs/wm8994_voodoo.c
index 750702f..15f097c 100644
--- a/sound/soc/codecs/wm8994_voodoo.c
+++ b/sound/soc/codecs/wm8994_voodoo.c
@@ -1593,13 +1593,13 @@ static struct attribute_group voodoo_sound_control_group = {
static struct miscdevice voodoo_sound_device = {
.minor = MISC_DYNAMIC_MINOR,
- .name = "voodoo_sound",
+ .name = "wm8994_sound",
};
#ifndef MODULE
static struct miscdevice voodoo_sound_control_device = {
.minor = MISC_DYNAMIC_MINOR,
- .name = "voodoo_sound_control",
+ .name = "wm8994_sound_control",
};
#endif