Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / drivers / firewire / fw-device.h

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 0ba9d64ccf4c64d4c48e658f33b724c3504d557e..d13e6a69707ffe6265a32fbd92efbfb0b31497d1 100644 (file)
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -40,6 +40,7 @@ struct fw_device {
        struct fw_node *node;
        int node_id;
        int generation;
+       unsigned max_speed;
        struct fw_card *card;
        struct device device;
        struct list_head link;
@@ -99,6 +100,7 @@ fw_unit(struct device *dev)
 #define CSR_DEPENDENT_INFO     0x14
 #define CSR_MODEL              0x17
 #define CSR_INSTANCE           0x18
+#define CSR_DIRECTORY_ID       0x20
 
 #define SBP2_COMMAND_SET_SPECIFIER     0x38
 #define SBP2_COMMAND_SET               0x39