Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder...

[linux-2.6-omap-h63xx.git] / drivers / scsi / 3w-xxxx.h

diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 4f81fc39ec57d7525a506021433aaefec0707702..0742e68466565459fffc6a7ae6ffaae4f91c9422 100644 (file)
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -6,7 +6,7 @@
                     Arnaldo Carvalho de Melo <acme@conectiva.com.br>
                      Brad Strand <linux@3ware.com>
 
-   Copyright (C) 1999-2005 3ware Inc.
+   Copyright (C) 1999-2007 3ware Inc.
 
    Kernel compatiblity By:     Andre Hedrick <andre@suse.com>
    Non-Copyright (C) 2000      Andre Hedrick <andre@suse.com>
@@ -74,7 +74,7 @@ static char *tw_aen_string[] = {
        [0x00D] = "ERROR: Logical unit deleted: Unit #",
        [0x00F] = "WARNING: SMART threshold exceeded: Port #",
        [0x021] = "WARNING: ATA UDMA downgrade: Port #",
-       [0x021] = "WARNING: ATA UDMA upgrade: Port #",
+       [0x022] = "WARNING: ATA UDMA upgrade: Port #",
        [0x023] = "WARNING: Sector repair occurred: Port #",
        [0x024] = "ERROR: SBUF integrity check failure",
        [0x025] = "ERROR: Lost cached write: Port #",
@@ -420,7 +420,7 @@ typedef struct TAG_TW_Device_Extension {
        u32                     max_sector_count;
        u32                     aen_count;
        struct Scsi_Host        *host;
-       struct semaphore        ioctl_sem;
+       struct mutex            ioctl_lock;
        unsigned short          aen_queue[TW_Q_LENGTH];
        unsigned char           aen_head;
        unsigned char           aen_tail;