Merge ../scsi-misc-2.6

Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 92c6154575e7..9e871de23835 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -262,7 +262,6 @@ typedef enum {
         AHD_DEV_PERIODIC_OTAG    = 0x40, /* Send OTAG to prevent starvation */
 } ahd_linux_dev_flags;
 
-struct ahd_linux_target;
 struct ahd_linux_device {
         TAILQ_ENTRY(ahd_linux_device) links;
 
@@ -342,12 +341,6 @@ struct ahd_linux_device {
 #define AHD_OTAG_THRESH 500
 };
 
-struct ahd_linux_target {
-        struct scsi_device       *sdev[AHD_NUM_LUNS];
-        struct ahd_transinfo      last_tinfo;
-        struct ahd_softc         *ahd;
-};
-
 /********************* Definitions Required by the Core ***********************/
 /*
  * Number of SG segments we require.  So long as the S/G segments for
@@ -864,7 +857,7 @@ ahd_freeze_scb(struct scb *scb)
         }
 }
 
-void    ahd_platform_set_tags(struct ahd_softc *ahd,
+void    ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
                               struct ahd_devinfo *devinfo, ahd_queue_alg);
 int     ahd_platform_abort_scbs(struct ahd_softc *ahd, int target,
                                 char channel, int lun, u_int tag,
@@ -873,7 +866,7 @@ irqreturn_t
         ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs);
 void    ahd_done(struct ahd_softc*, struct scb*);
 void    ahd_send_async(struct ahd_softc *, char channel,
-                       u_int target, u_int lun, ac_code, void *);
+                       u_int target, u_int lun, ac_code);
 void    ahd_print_path(struct ahd_softc *, struct scb *);
 
 #ifdef CONFIG_PCI