diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 18:53:40 +0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 18:53:40 +0400 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /drivers/scsi/mvsas/mv_sas.h | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| parent | e689cf0caf2d5ebcb300fb69887d35c0abdbdb97 (diff) | |
| download | linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.xz | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mvsas/mv_sas.h')
| -rw-r--r-- | drivers/scsi/mvsas/mv_sas.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h index 9f3cc13a5ce7..60e2fb7f2dca 100644 --- a/drivers/scsi/mvsas/mv_sas.h +++ b/drivers/scsi/mvsas/mv_sas.h @@ -67,7 +67,7 @@ extern const struct mvs_dispatch mvs_94xx_dispatch; extern struct kmem_cache *mvs_task_list_cache; #define DEV_IS_EXPANDER(type) \ - ((type == EDGE_DEV) || (type == FANOUT_DEV)) + ((type == SAS_EDGE_EXPANDER_DEVICE) || (type == SAS_FANOUT_EXPANDER_DEVICE)) #define bit(n) ((u64)1 << n) @@ -241,7 +241,7 @@ struct mvs_phy { struct mvs_device { struct list_head dev_entry; - enum sas_dev_type dev_type; + enum sas_device_type dev_type; struct mvs_info *mvi_info; struct domain_device *sas_device; struct timer_list timer; |