VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / message / fusion / mptscsih.h

diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 5ab0726..2c002b5 100644 (file)
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -108,75 +108,4 @@ struct mptscsih_driver_setup
         MPTSCSIH_SAF_TE,                        \
 }
 
-
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
- *     Various bits and pieces broke within the lk-2.4.0-testN series:-(
- *     So here are various HACKS to work around them.
- */
-
-/*
- *     tq_scheduler disappeared @ lk-2.4.0-test12
- *     (right when <linux/sched.h> newly defined TQ_ACTIVE)
- *     tq_struct reworked in 2.5.41. Include workqueue.h.
- */
-#      include <linux/sched.h>
-#      include <linux/workqueue.h>
-#define SCHEDULE_TASK(x)               \
-       if (schedule_work(x) == 0) {    \
-               /*MOD_DEC_USE_COUNT*/;  \
-       }
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-
-#define x_scsi_info            mptscsih_info
-#define x_scsi_queuecommand    mptscsih_qcmd
-#define x_scsi_abort           mptscsih_abort
-#define x_scsi_bus_reset       mptscsih_bus_reset
-#define x_scsi_dev_reset       mptscsih_dev_reset
-#define x_scsi_host_reset      mptscsih_host_reset
-#define x_scsi_bios_param      mptscsih_bios_param
-
-#define x_scsi_slave_alloc     mptscsih_slave_alloc
-#define x_scsi_slave_configure mptscsih_slave_configure
-#define x_scsi_slave_destroy   mptscsih_slave_destroy
-#define x_scsi_proc_info       mptscsih_proc_info
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
- *     MPT SCSI Host / Initiator decls...
- */
-extern const char      *x_scsi_info(struct Scsi_Host *);
-extern int              x_scsi_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-extern int              x_scsi_abort(Scsi_Cmnd *);
-extern int              x_scsi_bus_reset(Scsi_Cmnd *);
-extern int              x_scsi_dev_reset(Scsi_Cmnd *);
-extern int              x_scsi_host_reset(Scsi_Cmnd *);
-extern int              x_scsi_bios_param(struct scsi_device * sdev, struct block_device *bdev,
-                               sector_t capacity, int geom[]);
-extern int              x_scsi_slave_alloc(Scsi_Device *);
-extern int              x_scsi_slave_configure(Scsi_Device *);
-extern void             x_scsi_slave_destroy(Scsi_Device *);
-extern int              x_scsi_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-
-/*  include/scsi/scsi.h may not be quite complete...  */
-#ifndef RESERVE_10
-#define RESERVE_10             0x56
-#endif
-#ifndef RELEASE_10
-#define RELEASE_10             0x57
-#endif
-#ifndef PERSISTENT_RESERVE_IN
-#define PERSISTENT_RESERVE_IN  0x5e
 #endif
-#ifndef PERSISTENT_RESERVE_OUT
-#define PERSISTENT_RESERVE_OUT 0x5f
-#endif
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-
-#endif
-