From f969d69ba9f952e5bdd38278e25e26a3e4a61a70 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 29 Jan 2000 01:41:54 +0000 Subject: Merge with 2.3.27. --- drivers/scsi/ibmmca.h | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'drivers/scsi/ibmmca.h') diff --git a/drivers/scsi/ibmmca.h b/drivers/scsi/ibmmca.h index 58b3094b8..99d0fe90f 100644 --- a/drivers/scsi/ibmmca.h +++ b/drivers/scsi/ibmmca.h @@ -27,11 +27,7 @@ extern int ibmmca_reset (Scsi_Cmnd *, unsigned int); extern int ibmmca_biosparam (Disk *, kdev_t, int *); /*structure for /proc filesystem */ -extern struct proc_dir_entry proc_scsi_ibmmca; -#if LINUX_VERSION_CODE >= ibmmca_header_linux_version(2,1,0) -/* Stuff for Linux >= 2.1.0: */ -/*initialization for Scsi_host_template type (Linux >= 2.1.0) */ /* * 2/8/98 * Note to maintainer of IBMMCA. Do not change this initializer back to @@ -39,7 +35,7 @@ extern struct proc_dir_entry proc_scsi_ibmmca; * about this, but it will break things in the future. */ #define IBMMCA { \ - proc_dir: &proc_scsi_ibmmca, /*proc_dir*/ \ + proc_name: "ibmmca", /*proc_name*/ \ proc_info: ibmmca_proc_info, /*proc info fn*/ \ name: "IBM SCSI-Subsystem", /*name*/ \ detect: ibmmca_detect, /*detect fn*/ \ @@ -57,33 +53,4 @@ extern struct proc_dir_entry proc_scsi_ibmmca; use_clustering: ENABLE_CLUSTERING /*use_clustering*/ \ } -#else -/* Stuff for Linux < 2.1.0: */ - -/*initialization for Scsi_host_template type (Linux < 2.1.0) */ -#define IBMMCA { \ - NULL, /*next*/ \ - NULL, /*usage_count*/ \ - &proc_scsi_ibmmca, /*proc_dir*/ \ - ibmmca_proc_info, /*proc info fn*/ \ - "IBM SCSI-Subsystem", /*name*/ \ - ibmmca_detect, /*detect fn*/ \ - ibmmca_release, /*release fn*/ \ - NULL, /*info fn*/ \ - ibmmca_command, /*command fn*/ \ - ibmmca_queuecommand, /*queuecommand fn*/ \ - ibmmca_abort, /*abort fn*/ \ - ibmmca_reset, /*reset fn*/ \ - NULL, /*slave_attach fn*/ \ - ibmmca_biosparam, /*bios fn*/ \ - 16, /*can_queue*/ \ - 7, /*set by detect*/ \ - 16, /*sg_tablesize*/ \ - 1, /*cmd_per_lun*/ \ - 0, /*present*/ \ - 0, /*unchecked_isa_dma*/ \ - ENABLE_CLUSTERING /*use_clustering*/ \ - } -#endif /* kernelversion selection */ - #endif /* _IBMMCA_H */ -- cgit v1.2.3