diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/scsi/ultrastor.c | |
parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) |
Merge with 2.3.27.
Diffstat (limited to 'drivers/scsi/ultrastor.c')
-rw-r--r-- | drivers/scsi/ultrastor.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c index 1c97ad4fe..620b24748 100644 --- a/drivers/scsi/ultrastor.c +++ b/drivers/scsi/ultrastor.c @@ -148,11 +148,6 @@ #include "sd.h" #include<linux/stat.h> -struct proc_dir_entry proc_scsi_ultrastor = { - PROC_SCSI_ULTRASTOR, 9, "ultrastor", - S_IFDIR | S_IRUGO | S_IXUGO, 2 -}; - #define FALSE 0 #define TRUE 1 @@ -631,7 +626,7 @@ static int ultrastor_24f_detect(Scsi_Host_Template * tpnt) int ultrastor_detect(Scsi_Host_Template * tpnt) { - tpnt->proc_dir = &proc_scsi_ultrastor; + tpnt->proc_name = "ultrastor"; return ultrastor_14f_detect(tpnt) || ultrastor_24f_detect(tpnt); } |