Merge branch 'upstream-fixes'

[linux-2.6-omap-h63xx.git] / include / linux / hwmon-sysfs.h

diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
index 1b5018a965f58bdb98b909b70583836fe9008e94..7eb4004b36011b2188835751053195d0e1f7b047 100644 (file)
--- a/include/linux/hwmon-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
@@ -33,4 +33,19 @@ struct sensor_device_attribute sensor_dev_attr_##_name = {   \
        .index =        _index,                                 \
 }
 
+struct sensor_device_attribute_2 {
+       struct device_attribute dev_attr;
+       u8 index;
+       u8 nr;
+};
+#define to_sensor_dev_attr_2(_dev_attr) \
+       container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
+
+#define SENSOR_DEVICE_ATTR_2(_name,_mode,_show,_store,_nr,_index)      \
+struct sensor_device_attribute_2 sensor_dev_attr_##_name = {   \
+       .dev_attr =     __ATTR(_name,_mode,_show,_store),       \
+       .index =        _index,                                 \
+       .nr =           _nr,                                    \
+}
+
 #endif /* _LINUX_HWMON_SYSFS_H */