diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /drivers/message/fusion/mptbase.h | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'drivers/message/fusion/mptbase.h')
| -rw-r--r-- | drivers/message/fusion/mptbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 76c05bc24cb7..8f14090b8b71 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
| @@ -405,7 +405,7 @@ typedef struct _VirtTarget { | |||
| 405 | typedef struct _VirtDevice { | 405 | typedef struct _VirtDevice { |
| 406 | VirtTarget *vtarget; | 406 | VirtTarget *vtarget; |
| 407 | u8 configured_lun; | 407 | u8 configured_lun; |
| 408 | int lun; | 408 | u64 lun; |
| 409 | } VirtDevice; | 409 | } VirtDevice; |
| 410 | 410 | ||
| 411 | /* | 411 | /* |
| @@ -605,7 +605,7 @@ typedef struct _MPT_ADAPTER | |||
| 605 | int id; /* Unique adapter id N {0,1,2,...} */ | 605 | int id; /* Unique adapter id N {0,1,2,...} */ |
| 606 | int pci_irq; /* This irq */ | 606 | int pci_irq; /* This irq */ |
| 607 | char name[MPT_NAME_LENGTH]; /* "iocN" */ | 607 | char name[MPT_NAME_LENGTH]; /* "iocN" */ |
| 608 | char prod_name[MPT_NAME_LENGTH]; /* "LSIFC9x9" */ | 608 | const char *prod_name; /* "LSIFC9x9" */ |
| 609 | #ifdef CONFIG_FUSION_LOGGING | 609 | #ifdef CONFIG_FUSION_LOGGING |
| 610 | /* used in mpt_display_event_info */ | 610 | /* used in mpt_display_event_info */ |
| 611 | char evStr[EVENT_DESCR_STR_SZ]; | 611 | char evStr[EVENT_DESCR_STR_SZ]; |