Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 2cfdbef447db..1d11f7e77564 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#109 $
  *
  * $FreeBSD$
  */
@@ -222,6 +222,7 @@ typedef enum {
 typedef enum {
         AHD_FENONE              = 0x00000,
         AHD_WIDE                = 0x00001,/* Wide Channel */
+        AHD_AIC79XXB_SLOWCRC    = 0x00002,/* SLOWCRC bit should be set */
         AHD_MULTI_FUNC          = 0x00100,/* Multi-Function/Channel Device */
         AHD_TARGETMODE          = 0x01000,/* Has tested target mode support */
         AHD_MULTIROLE           = 0x02000,/* Space for two roles at a time */