diff --git a/CHANGES b/CHANGES index 0ff3675e..a4193b8c 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,7 @@ ask CVS about it: Module adm1021: Add support for adm1021a / adm1023 Module adm1025: Add support for remote temp; rename /proc entries to in[0-5] and temp[1-2]; fix negative temp readings + Module adm9240: Rename /proc entries to in[0-5] Module ddcmon: allow force and force_ddcmon parameters Module ds1621: new Module i2c-ali1535: Enhance error checking and recovery; add mutex diff --git a/kernel/chips/adm9240.c b/kernel/chips/adm9240.c index 27d075e6..7eb32585 100644 --- a/kernel/chips/adm9240.c +++ b/kernel/chips/adm9240.c @@ -316,17 +316,17 @@ static int __initdata adm9240_initialized = 0; is done through one of the 'extra' fields which are initialized when a new copy is allocated. */ static ctl_table adm9240_dir_table_template[] = { - {ADM9240_SYSCTL_IN0, "2.5V", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, - {ADM9240_SYSCTL_IN1, "Vccp1", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, - {ADM9240_SYSCTL_IN2, "3.3V", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, - {ADM9240_SYSCTL_IN3, "5V", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, - {ADM9240_SYSCTL_IN4, "12V", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, - {ADM9240_SYSCTL_IN5, "Vccp2", NULL, 0, 0644, NULL, &sensors_proc_real, + {ADM9240_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_in}, {ADM9240_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real, &sensors_sysctl_real, NULL, &adm9240_fan},