Merge branch 'fix/kconfig' into for-linus

2011-08-08 14:30:29 +02:00
parent 8039290a91 df944f6678
commit 0a2d31b62d
8622 changed files with 500717 additions and 361057 deletions
--- 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;