diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:15:50 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:15:50 -0800 |
| commit | 5b3382aad6a7c7e17fb61607d051772649cb1eef (patch) | |
| tree | 1a004ee24f8c5b6d58107dd7d4246504cc67ff48 /drivers/scsi/megaraid/megaraid_sas.h | |
| parent | 76c80a9a04eab07a74f363a161e215679ba4eb5f (diff) | |
| parent | dcb8baeceaa1c629bbd06f472cea023ad08a0c33 (diff) | |
Merge branch 'upstream/blkfront' into upstream/xen
* upstream/blkfront: (716 commits)
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: map REQ_FLUSH into a full barrier
Linux 2.6.37-rc1
CRIS: Add paths for CRISv10 serial driver
spi/pl022: fix erroneous platform data in U300
Input: ir-keytable - fix uninitialized variable warning
i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
i2c-i801: Handle multiple instances instead of keeping global state
i2c-i801: Add Intel Patsburg device ID
i2c: Drop unused I2C_CLASS_TV flags
Input: appletouch - remove extra KERN_DEBUG use from dprintk
locks: remove fl_copy_lock lock_manager operation
locks: let the caller free file_lock on ->setlease failure
initramfs: Fix initramfs size for 32-bit arches
nfsd4: initialize delegation pointer to lease
locks: fix setlease methods to free passed-in lock
locks: fix leaks on setlease errors
locks: prevent ENOMEM on lease unlock
...
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.h')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index 16a4f68a34b0..ad16f5e60046 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h @@ -18,9 +18,9 @@ /* * MegaRAID SAS Driver meta data */ -#define MEGASAS_VERSION "00.00.04.17.1-rc1" -#define MEGASAS_RELDATE "Oct. 29, 2009" -#define MEGASAS_EXT_VERSION "Thu. Oct. 29, 11:41:51 PST 2009" +#define MEGASAS_VERSION "00.00.04.31-rc1" +#define MEGASAS_RELDATE "May 3, 2010" +#define MEGASAS_EXT_VERSION "Mon. May 3, 11:41:51 PST 2010" /* * Device IDs @@ -706,6 +706,7 @@ struct megasas_ctrl_info { #define MEGASAS_MAX_LD_IDS (MEGASAS_MAX_LD_CHANNELS * \ MEGASAS_MAX_DEV_PER_CHANNEL) +#define MEGASAS_MAX_SECTORS (2*1024) #define MEGASAS_DBG_LVL 1 #define MEGASAS_FW_BUSY 1 |