projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/earlycon' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
include
/
scsi
/
libsas.h
diff --git
a/include/scsi/libsas.h
b/include/scsi/libsas.h
index ef937b56f9b54c44e4003d762eaa7105534077da..e2c1e66d58ae6c810e4ca18d4e62d9f78b2c3e4b 100644
(file)
--- a/
include/scsi/libsas.h
+++ b/
include/scsi/libsas.h
@@
-118,7
+118,7
@@
struct ex_phy {
enum ex_phy_state phy_state;
enum ex_phy_state phy_state;
- enum sas_dev_type attached_dev_type;
+ enum sas_dev
ice
_type attached_dev_type;
enum sas_linkrate linkrate;
u8 attached_sata_host:1;
enum sas_linkrate linkrate;
u8 attached_sata_host:1;
@@
-195,7
+195,7
@@
enum {
struct domain_device {
spinlock_t done_lock;
struct domain_device {
spinlock_t done_lock;
-
enum sas_dev
_type dev_type;
+
enum sas_device
_type dev_type;
enum sas_linkrate linkrate;
enum sas_linkrate min_linkrate;
enum sas_linkrate linkrate;
enum sas_linkrate min_linkrate;