Merge tag 'v3.10.99' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / enclosure.h

diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 9a33c5f7e1265fd23ee74462e3e93944cf414997..f6c229e2bffaf2bdb25ff4ad6476a19a28e49bf4 100644 (file)
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -29,7 +29,11 @@
 /* A few generic types ... taken from ses-2 */
 enum enclosure_component_type {
        ENCLOSURE_COMPONENT_DEVICE = 0x01,
+       ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS = 0x07,
+       ENCLOSURE_COMPONENT_SCSI_TARGET_PORT = 0x14,
+       ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT = 0x15,
        ENCLOSURE_COMPONENT_ARRAY_DEVICE = 0x17,
+       ENCLOSURE_COMPONENT_SAS_EXPANDER = 0x18,
 };
 
 /* ses-2 common element status */