Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux-2.6-block.git] / include / linux / enclosure.h

diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 0f826c14a337a4005e09192407069acaacd9fef3..7be22da321f38eb1327bbbcaabddd6cbca131d44 100644 (file)
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -79,6 +79,11 @@ struct enclosure_component_callbacks {
        int (*set_locate)(struct enclosure_device *,
                          struct enclosure_component *,
                          enum enclosure_component_setting);
+       void (*get_power_status)(struct enclosure_device *,
+                                struct enclosure_component *);
+       int (*set_power_status)(struct enclosure_device *,
+                               struct enclosure_component *,
+                               int);
        int (*show_id)(struct enclosure_device *, char *buf);
 };
 
@@ -94,6 +99,7 @@ struct enclosure_component {
        int locate;
        int slot;
        enum enclosure_status status;
+       int power_status;
 };
 
 struct enclosure_device {