Changeset 1671

Timestamp:

12/14/02 02:04:12 (11 years ago)

Author:

mds

Message:

keep tsunami from compiling on non-alphas in mkpatched kernel

(tickets 1047, 1086; last fix didn't work);
add vt8231 to mkpatched Makefile so it will compile

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• mkpatch/mkpatch.pl (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -21 +21 @@
   File sensors.conf.eg: Fix vt1211/vt8231 thermistor calculations
   Library: Add support for exponents and logarithms for vt1211/vt8235
+  Program mkpatch: Fix vt8231 compile; keep tsunami from menu on non-alpha
   Program sensors-detect: Add super i/o detection (smsc47m1, vt1211,
                           w83627hf, w83697hf)
@@ -30 +31 @@
   File doc/busses/i2c-sis645: Add license
   File doc/chips/lm92: Add license, features
-  File doc/chips/maxilife: Add license, parameters, features
+u File doc/chips/maxilife: Add license, parameters, features
   File doc/chips/smartbatt: Complete rewrite
   File doc/chips/vt8231: Add license, parameters

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -501 +501 @@
   http://www.lm-sensors.nu
 
+Via VT8231 Sensors
+CONFIG_SENSORS_VT8231
+  If you say yes here you get support for the integrated sensors in 
+  the Via VT8231 device. 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
+
 Winbond W83781D, W83782D, W83783S, W83627HF, AS99127F
 CONFIG_SENSORS_W83781D
@@ -811 +821 @@
     dep_tristate '  AMD 756/766/768/8111' CONFIG_I2C_AMD756 $CONFIG_I2C
     dep_tristate '  AMD 8111 SMBus 2.0' CONFIG_I2C_AMD8111 $CONFIG_I2C
-    dep_tristate '  DEC Tsunami I2C interface' CONFIG_I2C_TSUNAMI $CONFIG_I2C_ALGOBIT $CONFIG_ALPHA
+    if [ "$CONFIG_ALPHA" = "y" ]; then
+      dep_tristate '  DEC Tsunami I2C interface' CONFIG_I2C_TSUNAMI $CONFIG_I2C_ALGOBIT
+    fi
     dep_tristate '  Intel 82801AA, AB, BA, DB' CONFIG_I2C_I801 $CONFIG_I2C
     dep_tristate '  Intel i810AA/AB/E and i815' CONFIG_I2C_I810 $CONFIG_I2C_ALGOBIT
@@ -886 +898 @@
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
 obj-$(CONFIG_SENSORS_VT1211)    += vt1211.o
+obj-$(CONFIG_SENSORS_VT8231)    += vt8231.o
 obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
 
@@ -1133 +1146 @@
   ifeq ($(CONFIG_SENSORS_VT1211),m)
     M_OBJS += vt1211.o
+  endif
+endif
+
+ifeq ($(CONFIG_SENSORS_VT8211),y)
+  L_OBJS += vt8231.o
+else
+  ifeq ($(CONFIG_SENSORS_VT8231),m)
+    M_OBJS += vt8231.o
   endif
 endif