From a03c2edf3db7e528ae1c193702304d2cf87dc34d Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Sat, 14 Dec 2002 01:04:12 +0000
Subject: [PATCH] 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

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1671 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES            |  3 ++-
 mkpatch/mkpatch.pl | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7d074704..5c9eb6be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ ask CVS about it:
 2.7.1 (2003????)
   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)
 
@@ -29,7 +30,7 @@ ask CVS about it:
   File doc/busses/i2c-ali15x3: Add license, miscellaneous changes
   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
   File sensors.conf.eg: Add section for lm75; complete the lm78 section
diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl
index 0a1abb66..433e12a1 100755
--- a/mkpatch/mkpatch.pl
+++ b/mkpatch/mkpatch.pl
@@ -500,6 +500,16 @@ CONFIG_SENSORS_VT1211
   in the lm_sensors package, which you can download at 
   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
   If you say yes here you get support for the Winbond W8378x series 
@@ -810,7 +820,9 @@ sub gen_drivers_i2c_Config_in
     dep_tristate '  Apple Hydra Mac I/O' CONFIG_I2C_HYDRA $CONFIG_I2C_ALGOBIT
     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
     dep_tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 $CONFIG_I2C
@@ -885,6 +897,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o
 obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o
 obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o
 obj-$(CONFIG_SENSORS_VT1211)	+= vt1211.o
+obj-$(CONFIG_SENSORS_VT8231)	+= vt8231.o
 obj-$(CONFIG_SENSORS_W83781D)	+= w83781d.o
 
 include $(TOPDIR)/Rules.make
@@ -1135,6 +1148,14 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_SENSORS_VT8211),y)
+  L_OBJS += vt8231.o
+else
+  ifeq ($(CONFIG_SENSORS_VT8231),m)
+    M_OBJS += vt8231.o
+  endif
+endif
+
 ifeq ($(CONFIG_SENSORS_W83781D),y)
   L_OBJS += w83781d.o
 else