Merge ../scsi-rc-fixes-2.6

Conflicts:

	include/scsi/scsi_devinfo.h

Same number for two BLIST flags:  BLIST_MAX_512 and BLIST_ATTACH_PQ3

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 1d11f7e77564..bb5166da4358 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -372,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_RESET_POLL_ACTIVE = 0x200000,
+        AHD_BUS_RESET_ACTIVE  = 0x200000,
         AHD_UPDATE_PEND_CMDS  = 0x400000,
         AHD_RUNNING_QOUTFIFO  = 0x800000,
         AHD_HAD_FIRST_SEL     = 0x1000000
@@ -589,7 +589,7 @@ typedef enum {
         SCB_PACKETIZED          = 0x00800,
         SCB_EXPECT_PPR_BUSFREE  = 0x01000,
         SCB_PKT_SENSE           = 0x02000,
-        SCB_CMDPHASE_ABORT      = 0x04000,
+        SCB_EXTERNAL_RESET      = 0x04000,/* Device was reset externally */
         SCB_ON_COL_LIST         = 0x08000,
         SCB_SILENT              = 0x10000 /*
                                            * Be quiet about transmission type