summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-08 14:30:29 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-08 14:30:29 +0200
commit0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch)
treef755d74ec85248de645e10c45ed1a2ed467530f6 /sound/core
parentsound: pss - don't use the deprecated function check_region (diff)
parentALSA: Fix dependency of CONFIG_SND_TEA575X (diff)
downloadlinux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.tar.xz
linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.zip
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 7077f601da5a..601f0ebb677b 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -531,7 +531,7 @@ int __init snd_info_init(void)
{
struct proc_dir_entry *p;
- p = create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, NULL);
+ p = proc_mkdir("asound", NULL);
if (p == NULL)
return -ENOMEM;
snd_proc_root = p;