diff options
author | Corey Minyard | 2017-11-02 17:19:15 +0100 |
---|---|---|
committer | Corey Minyard | 2017-11-02 17:19:15 +0100 |
commit | 6297fabd93f93182245383ba7de56bef829a796b (patch) | |
tree | 804f5d28ada61b402d56281c9a047308d26347f4 /drivers/scsi/aacraid/aacraid.h | |
parent | ipmi_si: Delete an error message for a failed memory allocation in try_smi_in... (diff) | |
parent | module: Do not paper over type mismatches in module_param_call() (diff) | |
download | kernel-qcow2-linux-6297fabd93f93182245383ba7de56bef829a796b.tar.gz kernel-qcow2-linux-6297fabd93f93182245383ba7de56bef829a796b.tar.xz kernel-qcow2-linux-6297fabd93f93182245383ba7de56bef829a796b.zip |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 92fabf2b0c24..403a639574e5 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -2701,6 +2701,11 @@ static inline int aac_is_src(struct aac_dev *dev) return 0; } +static inline int aac_supports_2T(struct aac_dev *dev) +{ + return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64); +} + char * get_container_type(unsigned type); extern int numacb; extern char aac_driver_version[]; |