This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / scsi_proc.c

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index a50958b..00e160a 100644 (file)
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -27,9 +27,8 @@
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
 
-#include <scsi/scsi.h>
-#include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include "scsi.h"
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
@@ -312,7 +311,7 @@ int __init scsi_init_procfs(void)
 {
        struct proc_dir_entry *pde;
 
-       proc_scsi = proc_mkdir("scsi", NULL);
+       proc_scsi = proc_mkdir("scsi", 0);
        if (!proc_scsi)
                goto err1;
 
@@ -324,13 +323,13 @@ int __init scsi_init_procfs(void)
        return 0;
 
 err2:
-       remove_proc_entry("scsi", NULL);
+       remove_proc_entry("scsi", 0);
 err1:
        return -ENOMEM;
 }
 
 void scsi_exit_procfs(void)
 {
-       remove_proc_entry("scsi/scsi", NULL);
-       remove_proc_entry("scsi", NULL);
+       remove_proc_entry("scsi/scsi", 0);
+       remove_proc_entry("scsi", 0);
 }