X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fscsi_proc.c;h=00e160ac4c20e37c15b556c78948773c988d5490;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=a50958b1b6eee68ab3fa17d8da7bc3639d8ff02a;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index a50958b1b..00e160ac4 100644
--- 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);
 }