The patch titled applesmc: Use standard sysfs names for labels has been removed from the -mm tree. Its filename was applesmc-use-standard-sysfs-names-for-labels.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: applesmc: Use standard sysfs names for labels From: Jean Delvare <khali@xxxxxxxxxxxx> We have a standard suffix to associate a designation string to a sensor: _label. Use it instead of _position so that libsensors will catch it. (This isn't implemented yet, but should be soon.) Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx> Cc: Nicolas Boichat <nicolas@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/hwmon/applesmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/hwmon/applesmc.c~applesmc-use-standard-sysfs-names-for-labels drivers/hwmon/applesmc.c --- a/drivers/hwmon/applesmc.c~applesmc-use-standard-sysfs-names-for-labels +++ a/drivers/hwmon/applesmc.c @@ -981,7 +981,7 @@ static SENSOR_DEVICE_ATTR_2(fan##offset# static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \ applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \ \ -static SENSOR_DEVICE_ATTR(fan##offset##_position, S_IRUGO, \ +static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \ applesmc_show_fan_position, NULL, offset-1); \ \ static struct attribute *fan##offset##_attributes[] = { \ @@ -991,7 +991,7 @@ static struct attribute *fan##offset##_a &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \ - &sensor_dev_attr_fan##offset##_position.dev_attr.attr, \ + &sensor_dev_attr_fan##offset##_label.dev_attr.attr, \ NULL \ }; _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are origin.patch git-alsa.patch git-dvb.patch scx200-use-mutex-instead-of-semaphore.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html