Changeset 1777

Timestamp:

06/08/03 23:33:39 (5 years ago)

Author:

mds

Message:

adm1026 and auto-sensors.h patch from P.P.

Files:

• lm-sensors/trunk/CHANGES (modified) (4 diffs)
• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/Makefile (modified) (5 diffs)
• lm-sensors/trunk/README (modified) (5 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/adm1026 (added)
• lm-sensors/trunk/kernel/chips/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/adm1026.c (added)
• lm-sensors/trunk/kernel/chips/lm85.c (modified) (4 diffs)
• lm-sensors/trunk/kernel/chips/lm92.c (modified) (1 diff)
• lm-sensors/trunk/kernel/include/Module.mk (modified) (2 diffs)
• lm-sensors/trunk/kernel/include/sensors.h.template (added)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/lib/proc.c (modified) (1 diff)
• lm-sensors/trunk/mkpatch/Config.in (modified) (1 diff)
• lm-sensors/trunk/mkpatch/FILES (modified) (1 diff)
• lm-sensors/trunk/mkpatch/mkpatch.pl (modified) (7 diffs)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -26 +26 @@
-  File sensors.conf.eg: Fix vt1211/vt8231 thermistor calculations
-  Library: Add support for exponents and logarithms for vt1211/vt8235 temps;
-lm85 support; add
+adm1026, lm85,
-  Makefiles: Generate warnings if new library won't be found by ld.so;
-             Modules now install in kernel/drivers/i2c/[busses,chips];
-             Ensure that headers in /usr/local/include are used first;
-             Don't use /usr/include headers for modules;
-
+
+
-  Modules (all): Cleanups including
-                - Add #include <i2c-proc.h>
@@ -50 +51 @@
-  Module adm1021: Set alarm on failed reads and report old value;
-                  merge changes from kernel 2.5.54
+  Module adm1026: New
-  Module bmcsensors: Fix compile when DEBUG=1
-  Modules ddcmon, eeprom: Use i2c block reads if possible;
-                          better error handling
+  Module ds1307: Add to Makefile
-  Module gl520sm: Fix temperature over/hyst writes
-  Module lm75: merge changes from kernel 2.5.54
@@ -58 +61 @@
-  Module i2c-amd756: merge changes from kernel 2.5.54
-  Module i2c-amd8111: merge changes from kernel 2.5.54
-
-
+
+
+
-  Module i2c-sis645: Add support for SiS651, SiS961, SiS745
-  Modules mtp008, smsc47m1, vt1211, vt8231, w83781d: Standardize and improve
-          pwm and pwm enable support; update docs
+  Module w83781d: Add support for w83791d
-  Module w83627hf: New
-  Program decode-dimms.pl: Recognize DDR and Rambus
@@ -68 +73 @@
-  Program eeprom, eepromer: Use local i2c-dev.h for build
-  Program lm_sensors.init: Call sensors -s in start()
-
+
+
-  Program p4b_smbus: Fix 'make install', install in same place as other modules
-  Program pwmtest: New
-lm85 support; add
+adm1026, lm85,
-  Program sensors-detect: Add super i/o detection (smsc47m1, vt1211,
-                          w83627hf, w83697hf);
-                          Add support for SiS651, SiS961, SiS745, nForce2;
-
+
+
+
-
-2.7.0 (20021208)

lm-sensors/trunk/CONTRIBUTORS

@@ -86 +86 @@
-* Philip Pokorny <ppokorny@penguincomputing.com>
-  Author of the LM85 chip driver.
+  Author of the ADM1026 chip driver.

lm-sensors/trunk/Makefile

@@ -172 +172 @@
-LN := ln -sfn
-GREP := grep
+AWK := awk
+SED := sed
-
-# Determine the default compiler flags
@@ -287 +289 @@
-%.d: %.c
-        $(CC) -M -MG $(MODCPPFLAGS) $(MODCFLAGS) $< | \
-sed
+$(SED)
-
-
@@ -297 +299 @@
-%.rd: %.c
-        $(CC) -M -MG $(PROGCPPFLAGS) $(PROGCFLAGS) $< | \
-sed
+$(SED)
-
-
@@ -310 +312 @@
-%.ad: %.c
-        $(CC) -M -MG $(ARCPPFLAGS) $(ARCFLAGS) $< | \
-sed
+$(SED)
-
-
@@ -319 +321 @@
-%.ld: %.c
-        $(CC) -M -MG $(LIBCPPFLAGS) $(LIBCFLAGS) $< | \
-sed
+$(SED)
-
-

lm-sensors/trunk/README

@@ -9 +9 @@
-OVERVIEW OF THE LM_SENSORS PACKAGE AND SUMMARY OF SUPPORTED DEVICES
-
-7
+8
-
-FOR 2.5 KERNELS, we do not recommend attempting to compile this package.
-kernel patches linked from our download page instead!!!
+the drivers already in the 2.5 kernel development tree.
-
-=============================================================================
@@ -20 +20 @@
-Version 1 is now officially unsupported.
-
-compile for 2.2 and 2.4 kernels
+kernels 2.4.9 - 2.4.xx
-Use lm_sensors-2.4.5 for 2.0 kernels.
+Use lm_sensors-2.7.0 for 2.2, 2.3, and 2.4.0 - 2.4.8 kernels.
-Use the kernel patches linked from our download page for 2.5 kernels.
-
-7
+8
-EVEN IF your kernel does contain i2c support!!!!!!!!!
-
-Kernels 2.3.34 and later, and all 2.4.x kernels, contain the
-19
+20
-which is NOT sufficient for compilation of this package.
-
@@ -47 +48 @@
-  Apple Hydra (used on some PPC machines)
-  DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards)
- (used in Intel 810, 810E, 815E, 820, 840 chipsets)
+/ICH4/ICH5
-  Intel PIIX4 (used in many Intel chipsets)
-  Intel I810/I815 GMCH
@@ -61 +62 @@
-
-At least the following hardware sensor chips are supported:
-
-4, ADM1025
+, ADM1024,
+5, ADM1026
-                 ADT7463
-  Asus AS99127F, ASB100 Bach
@@ -78 +79 @@
-  Philips NE1617, NE1617A
-  SiS 5595, 950 embedded sensors
-
+, EMC6D100, EMC6D101
-  TI THMC10 and THMC50
-  VIA Technologies VT1211 and VT82C686A/B embedded sensors

lm-sensors/trunk/doc/chips/SUMMARY

@@ -64 +64 @@
-        adm1025         2       6       -       -       yes     no
-
+adm1026
+        adm1026         3       17      8       2 pwm+dac yes   no
+
-adm9240
-        adm9240         1       6       2       1 dac   yes     no

lm-sensors/trunk/kernel/chips/Module.mk

@@ -46 +46 @@
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1025=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1025.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1026=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1026.o
-endif
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM9240=y' $(LINUX)/.config; then echo 1; fi),1)

lm-sensors/trunk/kernel/chips/lm85.c

@@ -484 +484 @@
-};
-
+/* Unique ID assigned to each LM85 detected */
+static int lm85_id = 0;
+
-/* -- SENSORS SYSCTL START -- */
-/* Common parameters */
@@ -552 +555 @@
-#define LM85_ALARM_TEMP3_FAULT 0x08000
-/* -- SENSORS SYSCTL END -- */
-
-/* Unique ID assigned to each LM85 detected */
-static int lm85_id = 0;
-
-/* The /proc/sys entries */
@@ -1568 +1568 @@
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                int  old_config ;
+
-                down(&data->update_lock);
-                old_config = data->autofan[nr].config ;
@@ -1930 +1931 @@
-static int __init sm_lm85_init(void)
-{
- v
+: V
-        printk("lm85: See http://www.penguincomputing.com/lm_sensors for more info.\n" );
-        return i2c_add_driver(&lm85_driver);

lm-sensors/trunk/kernel/chips/lm92.c

@@ -61 +61 @@
-/* -- SENSORS SYSCTL START -- */
-#define LM92_SYSCTL_ALARMS              2001    /* high, low, critical */
-i
+e
-
-#define LM92_ALARM_TEMP_HIGH    0x01

lm-sensors/trunk/kernel/include/Module.mk

@@ -27 +27 @@
-endif
-
+$(KERNELINCLUDEDIR)/sensors.h: $(KERNELINCLUDEDIR)/sensors.h.template
+        ( cat $@.template ; \
+           $(AWK) '/SENSORS SYSCTL START/,/SENSORS SYSCTL END/' $(KERNELCHIPSDIR)/*.c ;\
+           echo '#endif' \
+        ) > $@
+
+$(KERNELINCLUDEDIR)/sensors.hd:
+        ( $(GREP) 'SENSORS SYSCTL START' /dev/null $(KERNELCHIPSDIR)/*.c | \
+          $(SED) -e 's/:.*//' -e 's#^#$(KERNELINCLUDEDIR)/sensors.h: #' ) > $@
+
+# Get dependancies of sensors.h
+INCLUDEFILES += $(MODULE_DIR)/sensors.hd
+
-install-all-kernel-include:
-        if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
@@ -36 +49 @@
-
-clean-all-kernel-include:
-
+ $(KERNELINCLUDEDIR)/sensors.h $(KERNELINCLUDEDIR)/sensors.hd
-
-clean :: clean-all-kernel-include

lm-sensors/trunk/lib/chips.c

@@ -2082 +2082 @@
-    { 0 }
-  };
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static sensors_chip_feature via686a_features[] =
-  { 
@@ -3967 +4283 @@
- { SENSORS_ADM1022_PREFIX, thmc50_features },
- { SENSORS_ADM1025_PREFIX, adm1025_features },
+ { SENSORS_ADM1026_PREFIX, adm1026_features },
- { SENSORS_VIA686A_PREFIX, via686a_features },
- { SENSORS_DDCMON_PREFIX, ddcmon_features },

lm-sensors/trunk/lib/chips.h

@@ -946 +946 @@
-
-
+#define SENSORS_ADM1026_PREFIX "adm1026"
+/* NOTE: print_adm1026 (sensors) depends on the ordering
+ *    of these entries in each group.  For example
+ *         fan#, fan#_div, fan#_min
+ *         temp#, temp#_max, temp#_min, temp#_offset
+ *    and the ordering of the groups
+ *         in0, in1, ... in9, in10, in11
+ */
+#define SENSORS_ADM1026_AFC_DAC            1  /* RW -- afc_analog_out  */
+#define SENSORS_ADM1026_AFC_PWM            2  /* RW -- afc_pwm  */
+#define SENSORS_ADM1026_ALARMS             3  /* R  -- alarms  */
+#define SENSORS_ADM1026_ALARM_MASK         4  /* R  -- alarm_mask  */
+#define SENSORS_ADM1026_DAC                5  /* RW -- analog_out  */
+#define SENSORS_ADM1026_GPIO               6  /* R  -- gpio  */
+#define SENSORS_ADM1026_GPIO_MASK          7  /* R  -- gpio_mask  */
+#define SENSORS_ADM1026_PWM                8  /* RW -- pwm  */
+#define SENSORS_ADM1026_VID                9  /* RW -- vid  */
+#define SENSORS_ADM1026_VRM               10  /* RW -- vrm  */
+#define SENSORS_ADM1026_FAN0              11  /* R  -- fan0  */
+#define SENSORS_ADM1026_FAN0_DIV          12  /* RW -- fan0_div  */
+#define SENSORS_ADM1026_FAN0_MIN          13  /* RW -- fan0_min  */
+#define SENSORS_ADM1026_FAN1              14  /* R  -- fan1  */
+#define SENSORS_ADM1026_FAN1_DIV          15  /* RW -- fan1_div  */
+#define SENSORS_ADM1026_FAN1_MIN          16  /* RW -- fan1_min  */
+#define SENSORS_ADM1026_FAN2              17  /* R  -- fan2  */
+#define SENSORS_ADM1026_FAN2_DIV          18  /* RW -- fan2_div  */
+#define SENSORS_ADM1026_FAN2_MIN          19  /* RW -- fan2_min  */
+#define SENSORS_ADM1026_FAN3              20  /* R  -- fan3  */
+#define SENSORS_ADM1026_FAN3_DIV          21  /* RW -- fan3_div  */
+#define SENSORS_ADM1026_FAN3_MIN          22  /* RW -- fan3_min  */
+#define SENSORS_ADM1026_FAN4              23  /* R  -- fan4  */
+#define SENSORS_ADM1026_FAN4_DIV          24  /* RW -- fan4_div  */
+#define SENSORS_ADM1026_FAN4_MIN          25  /* RW -- fan4_min  */
+#define SENSORS_ADM1026_FAN5              26  /* R  -- fan5  */
+#define SENSORS_ADM1026_FAN5_DIV          27  /* RW -- fan5_div  */
+#define SENSORS_ADM1026_FAN5_MIN          28  /* RW -- fan5_min  */
+#define SENSORS_ADM1026_FAN6              29  /* R  -- fan6  */
+#define SENSORS_ADM1026_FAN6_DIV          30  /* RW -- fan6_div  */
+#define SENSORS_ADM1026_FAN6_MIN          31  /* RW -- fan6_min  */
+#define SENSORS_ADM1026_FAN7              32  /* R  -- fan7  */
+#define SENSORS_ADM1026_FAN7_DIV          33  /* RW -- fan7_div  */
+#define SENSORS_ADM1026_FAN7_MIN          34  /* RW -- fan7_min  */
+#define SENSORS_ADM1026_IN0               35  /* R  -- in0  */
+#define SENSORS_ADM1026_IN0_MAX           36  /* RW -- in0_max  */
+#define SENSORS_ADM1026_IN0_MIN           37  /* RW -- in0_min  */
+#define SENSORS_ADM1026_IN1               38  /* R  -- in1  */
+#define SENSORS_ADM1026_IN1_MAX           39  /* RW -- in1_max  */
+#define SENSORS_ADM1026_IN1_MIN           40  /* RW -- in1_min  */
+#define SENSORS_ADM1026_IN2               41  /* R  -- in2  */
+#define SENSORS_ADM1026_IN2_MAX           42  /* RW -- in2_max  */
+#define SENSORS_ADM1026_IN2_MIN           43  /* RW -- in2_min  */
+#define SENSORS_ADM1026_IN3               44  /* R  -- in3  */
+#define SENSORS_ADM1026_IN3_MAX           45  /* RW -- in3_max  */
+#define SENSORS_ADM1026_IN3_MIN           46  /* RW -- in3_min  */
+#define SENSORS_ADM1026_IN4               47  /* R  -- in4  */
+#define SENSORS_ADM1026_IN4_MAX           48  /* RW -- in4_max  */
+#define SENSORS_ADM1026_IN4_MIN           49  /* RW -- in4_min  */
+#define SENSORS_ADM1026_IN5               50  /* R  -- in5  */
+#define SENSORS_ADM1026_IN5_MAX           51  /* RW -- in5_max  */
+#define SENSORS_ADM1026_IN5_MIN           52  /* RW -- in5_min  */
+#define SENSORS_ADM1026_IN6               53  /* R  -- in6  */
+#define SENSORS_ADM1026_IN6_MAX           54  /* RW -- in6_max  */
+#define SENSORS_ADM1026_IN6_MIN           55  /* RW -- in6_min  */
+#define SENSORS_ADM1026_IN7               56  /* R  -- in7  */
+#define SENSORS_ADM1026_IN7_MAX           57  /* RW -- in7_max  */
+#define SENSORS_ADM1026_IN7_MIN           58  /* RW -- in7_min  */
+#define SENSORS_ADM1026_IN8               59  /* R  -- in8  */
+#define SENSORS_ADM1026_IN8_MAX           60  /* RW -- in8_max  */
+#define SENSORS_ADM1026_IN8_MIN           61  /* RW -- in8_min  */
+#define SENSORS_ADM1026_IN9               62  /* R  -- in9  */
+#define SENSORS_ADM1026_IN9_MAX           63  /* RW -- in9_max  */
+#define SENSORS_ADM1026_IN9_MIN           64  /* RW -- in9_min  */
+#define SENSORS_ADM1026_IN10              65  /* R  -- in10  */
+#define SENSORS_ADM1026_IN10_MAX          66  /* RW -- in10_max  */
+#define SENSORS_ADM1026_IN10_MIN          67  /* RW -- in10_min  */
+#define SENSORS_ADM1026_IN11              68  /* R  -- in11  */
+#define SENSORS_ADM1026_IN11_MAX          69  /* RW -- in11_max  */
+#define SENSORS_ADM1026_IN11_MIN          70  /* RW -- in11_min  */
+#define SENSORS_ADM1026_IN12              71  /* R  -- in12  */
+#define SENSORS_ADM1026_IN12_MAX          72  /* RW -- in12_max  */
+#define SENSORS_ADM1026_IN12_MIN          73  /* RW -- in12_min  */
+#define SENSORS_ADM1026_IN13              74  /* R  -- in13  */
+#define SENSORS_ADM1026_IN13_MAX          75  /* RW -- in13_max  */
+#define SENSORS_ADM1026_IN13_MIN          76  /* RW -- in13_min  */
+#define SENSORS_ADM1026_IN14              77  /* R  -- in14  */
+#define SENSORS_ADM1026_IN14_MAX          78  /* RW -- in14_max  */
+#define SENSORS_ADM1026_IN14_MIN          79  /* RW -- in14_min  */
+#define SENSORS_ADM1026_IN15              80  /* R  -- in15  */
+#define SENSORS_ADM1026_IN15_MAX          81  /* RW -- in15_max  */
+#define SENSORS_ADM1026_IN15_MIN          82  /* RW -- in15_min  */
+#define SENSORS_ADM1026_IN16              83  /* R  -- in16  */
+#define SENSORS_ADM1026_IN16_MAX          84  /* RW -- in16_max  */
+#define SENSORS_ADM1026_IN16_MIN          85  /* RW -- in16_min  */
+#define SENSORS_ADM1026_TEMP1             86  /* R  -- temp1  */
+#define SENSORS_ADM1026_TEMP1_MAX         87  /* RW -- temp1_max  */
+#define SENSORS_ADM1026_TEMP1_MIN         88  /* RW -- temp1_min  */
+#define SENSORS_ADM1026_TEMP1_OFFSET      89  /* RW -- temp1_offset  */
+#define SENSORS_ADM1026_TEMP1_THERM       90  /* RW -- temp1_therm  */
+#define SENSORS_ADM1026_TEMP1_TMIN        91  /* RW -- temp1_tmin  */
+#define SENSORS_ADM1026_TEMP2             92  /* R  -- temp2  */
+#define SENSORS_ADM1026_TEMP2_MAX         93  /* RW -- temp2_max  */
+#define SENSORS_ADM1026_TEMP2_MIN         94  /* RW -- temp2_min  */
+#define SENSORS_ADM1026_TEMP2_OFFSET      95  /* RW -- temp2_offset  */
+#define SENSORS_ADM1026_TEMP2_THERM       96  /* RW -- temp2_therm  */
+#define SENSORS_ADM1026_TEMP2_TMIN        97  /* RW -- temp2_tmin  */
+#define SENSORS_ADM1026_TEMP3             98  /* R  -- temp3  */
+#define SENSORS_ADM1026_TEMP3_MAX         99  /* RW -- temp3_max  */
+#define SENSORS_ADM1026_TEMP3_MIN        100  /* RW -- temp3_min  */
+#define SENSORS_ADM1026_TEMP3_OFFSET     101  /* RW -- temp3_offset  */
+#define SENSORS_ADM1026_TEMP3_THERM      102  /* RW -- temp3_therm  */
+#define SENSORS_ADM1026_TEMP3_TMIN       103  /* RW -- temp3_tmin  */
+
-
-#define SENSORS_VIA686A_PREFIX "via686a"

lm-sensors/trunk/lib/proc.c

@@ -184 +184 @@
-  if (sysctl(sysctl_name, 4, buf, &buflen, NULL, 0))
-    return -SENSORS_ERR_PROC;
+  if (sysctl_name[0] != CTL_DEV) { sysctl_name[0] = CTL_DEV ; }
-  for (mag = the_feature->scaling; mag > 0; mag --)
-    value *= 10.0;

lm-sensors/trunk/mkpatch/Config.in

@@ -16 +16 @@
-    dep_tristate '  Analog Devices ADM1024' CONFIG_SENSORS_ADM1024 $CONFIG_I2C $CONFIG_I2C_PROC
-    dep_tristate '  Analog Devices ADM1025' CONFIG_SENSORS_ADM1025 $CONFIG_I2C $CONFIG_I2C_PROC
+    dep_tristate '  Analog Devices ADM1026' CONFIG_SENSORS_ADM1026 $CONFIG_I2C $CONFIG_I2C_PROC
-    dep_tristate '  Analog Devices ADM9240 and compatibles' CONFIG_SENSORS_ADM9240 $CONFIG_I2C $CONFIG_I2C_PROC
-    dep_tristate '  Dallas DS1621 and DS1625' CONFIG_SENSORS_DS1621 $CONFIG_I2C $CONFIG_I2C_PROC

lm-sensors/trunk/mkpatch/FILES

@@ -22 +22 @@
-kernel/chips/adm1024.c          drivers/sensors/adm1024.c
-kernel/chips/adm1025.c          drivers/sensors/adm1025.c
+kernel/chips/adm1026.c          drivers/sensors/adm1026.c
-kernel/chips/adm9240.c          drivers/sensors/adm9240.c
-kernel/chips/bt869.c            drivers/sensors/bt869.c

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -95 +95 @@
-           m@Analog Devices ADM1024@ or
-           m@Analog Devices ADM1025@ or
+           m@Analog Devices ADM1026@ or
-           m@Analog Devices ADM9240 and compatibles@ or
-           m@Dallas DS1621 and DS1625@ or
@@ -107 +108 @@
-           m@National Semiconductors LM78@ or
-           m@National Semiconductors LM80@ or
+           m@National Semiconductors LM85 and compatibles@ or
-           m@National Semiconductors LM87@ or
-           m@Silicon Integrated Systems Corp. SiS5595 Sensor@ or
@@ -284 +286 @@
-  http://www.lm-sensors.nu
-
+Analog Devices ADM1026
+CONFIG_SENSORS_ADM1026
+  If you say yes here you get support for Analog Devices ADM1026 sensor
+  chips.  This can also be built as a module which can be inserted and
+  removed while the kernel is running.
+
+  You will also need the latest user-space utilties: you can find them
+  in the lm_sensors package, which you can download at 
+  http://www.lm-sensors.nu
+
-Analog Devices ADM9240 and compatibles
-CONFIG_SENSORS_ADM9240
@@ -402 +414 @@
-  sensor chips. This can also be built as a module which can be 
-  inserted and removed while the kernel is running.
+
+  You will also need the latest user-space utilties: you can find them
+  in the lm_sensors package, which you can download at 
+  http://www.lm-sensors.nu
+
+National Semiconductor LM85
+CONFIG_SENSORS_LM85
+  If you say yes here you get support for National Semiconductor LM85
+  sensor chips and compatibles.  Compatible chips include the Analog
+  Devices ADM1027 and ADT7463 and SMSC EMC6D100 and EMC6D101.  This
+  can also be built as a module which can be inserted and removed
+  while the kernel is running.
-
-  You will also need the latest user-space utilties: you can find them
@@ -874 +898 @@
-obj-$(CONFIG_SENSORS_ADM1024)   += adm1024.o
-obj-$(CONFIG_SENSORS_ADM1025)   += adm1025.o
+obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
-obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
-obj-$(CONFIG_SENSORS_BT869)     += bt869.o
@@ -958 +983 @@
-endif
-
+ifeq ($(CONFIG_SENSORS_ADM1026),y)
+  L_OBJS += adm1026.o
+else
+  ifeq ($(CONFIG_SENSORS_ADM1026),m)
+    M_OBJS += adm1026.o
+  endif
+endif
+
-ifeq ($(CONFIG_SENSORS_ADM9240),y)
-  L_OBJS += adm9240.o
@@ -1051 +1084 @@
-  ifeq ($(CONFIG_SENSORS_LM80),m)
-    M_OBJS += lm80.o
+  endif
+endif
+
+ifeq ($(CONFIG_SENSORS_LM85),y)
+  L_OBJS += lm85.o
+else
+  ifeq ($(CONFIG_SENSORS_LM85),m)
+    M_OBJS += lm85.o
-  endif
-endif