linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / aic7xxx / aic79xx.h

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index df3346b..1d11f7e 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -68,6 +68,8 @@ struct scb_platform_data;
 #define FALSE 0
 #endif
 
+#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))
+
 #define ALL_CHANNELS '\0'
 #define ALL_TARGETS_MASK 0xFFFF
 #define INITIATOR_WILDCARD     (~0)
@@ -370,7 +372,7 @@ typedef enum {
        AHD_CURRENT_SENSING   = 0x40000,
        AHD_SCB_CONFIG_USED   = 0x80000,/* No SEEPROM but SCB had info. */
        AHD_HP_BOARD          = 0x100000,
-       AHD_BUS_RESET_ACTIVE  = 0x200000,
+       AHD_RESET_POLL_ACTIVE = 0x200000,
        AHD_UPDATE_PEND_CMDS  = 0x400000,
        AHD_RUNNING_QOUTFIFO  = 0x800000,
        AHD_HAD_FIRST_SEL     = 0x1000000
@@ -587,7 +589,7 @@ typedef enum {
        SCB_PACKETIZED          = 0x00800,
        SCB_EXPECT_PPR_BUSFREE  = 0x01000,
        SCB_PKT_SENSE           = 0x02000,
-       SCB_EXTERNAL_RESET      = 0x04000,/* Device was reset externally */
+       SCB_CMDPHASE_ABORT      = 0x04000,
        SCB_ON_COL_LIST         = 0x08000,
        SCB_SILENT              = 0x10000 /*
                                           * Be quiet about transmission type
@@ -1487,7 +1489,6 @@ typedef enum {
 } ahd_queue_alg;
 
 void                   ahd_set_tags(struct ahd_softc *ahd,
-                                    struct scsi_cmnd *cmd,
                                     struct ahd_devinfo *devinfo,
                                     ahd_queue_alg alg);