Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / ide / ide.c

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 2714aa1..2bdb860 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2320,7 +2320,7 @@ int __init ide_init (void)
        init_ide_data();
 
 #ifdef CONFIG_PROC_FS
-       proc_ide_root = proc_mkdir("ide", 0);
+       proc_ide_root = proc_mkdir("ide", NULL);
 #endif
 
 #ifdef CONFIG_BLK_DEV_ALI14XX