Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / scsi / megaraid / megaraid_mbox.h

diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index 9de803cebd4badec858161d679a0b85905b9026a..c1d86d961a92df976c63da2dfa0cbd39d1babc52 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -88,6 +88,7 @@
 #define PCI_SUBSYS_ID_PERC3_QC                         0x0471
 #define PCI_SUBSYS_ID_PERC3_DC                         0x0493
 #define PCI_SUBSYS_ID_PERC3_SC                         0x0475
+#define PCI_SUBSYS_ID_CERC_ATA100_4CH                  0x0511
 
 
 #define MBOX_MAX_SCSI_CMDS     128     // number of cmds reserved for kernel
@@ -168,7 +169,7 @@ typedef struct {
  * @hw_error                   : set if FW not responding
  * @fast_load                  : If set, skip physical device scanning
  * @channel_class              : channel class, RAID or SCSI
- * @sysfs_sem                  : semaphore to serialize access to sysfs res.
+ * @sysfs_mtx                  : mutex to serialize access to sysfs res.
  * @sysfs_uioc                 : management packet to issue FW calls from sysfs
  * @sysfs_mbox64               : mailbox packet to issue FW calls from sysfs
  * @sysfs_buffer               : data buffer for FW commands issued from sysfs
@@ -208,7 +209,7 @@ typedef struct {
        int                             hw_error;
        int                             fast_load;
        uint8_t                         channel_class;
-       struct semaphore                sysfs_sem;
+       struct mutex                    sysfs_mtx;
        uioc_t                          *sysfs_uioc;
        mbox64_t                        *sysfs_mbox64;
        caddr_t                         sysfs_buffer;