Changeset 1631

Timestamp:

11/20/02 02:28:58 (6 years ago)

Author:

amalysh

Message:

added i2c-sis630/i2c-sis645 into mkpatch

Files:

• lm-sensors/trunk/kernel/busses/Module.mk (modified) (1 diff)
• lm-sensors/trunk/mkpatch/FILES (modified) (1 diff)
• lm-sensors/trunk/mkpatch/mkpatch.pl (modified) (7 diffs)

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

@@ -30 +30 @@
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmi.o
-endif
+# These targets ARE included in 'mkpatch' ...
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS630=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS645=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o
-
-
+
-ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali1535.o

lm-sensors/trunk/mkpatch/FILES

@@ -16 +16 @@
-kernel/busses/i2c-viapro.c      drivers/i2c/i2c-viapro.c
-kernel/busses/i2c-voodoo3.c     drivers/i2c/i2c-voodoo3.c
+kernel/busses/i2c-sis630.c      drivers/i2c/i2c-sis630.c
+kernel/busses/i2c-sis645.c      drivers/i2c/i2c-sis645.c
-kernel/sensors.c                drivers/sensors/sensors.c
-kernel/chips/adm1021.c          drivers/sensors/adm1021.c

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -190 +190 @@
-  is running.
-
+Silicon Integrated Systems Corp. SiS630/730 based Mainboard
+CONFIG_I2C_SIS630
+  If you say yes to this option, support will be included for the SiS 630
+  and 730 mainboard I2C interfaces. This can also be built as a module 
+  which can be inserted and removed while the kernel is running.
+
+Silicon Integrated Systems Corp. SiS645/961,645DX/961,735 based Mainboard
+CONFIG_I2C_SIS645
+  If you say yes to this option, support will be included for the SiS 645/961,
+  645DX/961 and 735 mainboard I2C interfaces. This can also be built as a module
+  which can be inserted and removed while the kernel is running.
+
-VIA Technologies, Inc. VT82C586B
-CONFIG_I2C_VIA
@@ -236 +248 @@
-  If you say yes here you get support for Analog Devices ADM1021 
-  and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
-
+ Onsemi MC1066
-  and the XEON processor built-in sensor. This can also 
-  be built as a module which can be inserted and removed while the 
@@ -795 +807 @@
-    dep_tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 $CONFIG_I2C
-    dep_tristate '  SiS 5595' CONFIG_I2C_SIS5595 $CONFIG_I2C
+    dep_tristate '  SiS 630/730' CONFIG_I2C_SIS630 $CONFIG_I2C
+    dep_tristate '  SiS 645/961,645DX/961,735' CONFIG_I2C_SIS645 $CONFIG_I2C $CONFIG_HOTPLUG
-    dep_tristate '  Savage 4' CONFIG_I2C_SAVAGE4 $CONFIG_I2C_ALGOBIT
-    dep_tristate '  VIA Technologies, Inc. VT82C586B' CONFIG_I2C_VIA $CONFIG_I2C_ALGOBIT
@@ -1165 +1179 @@
-obj-$(CONFIG_I2C_PIIX4)                 += i2c-piix4.o dmi_scan.o
-obj-$(CONFIG_I2C_SIS5595)               += i2c-sis5595.o
+obj-$(CONFIG_I2C_SIS630)                += i2c-sis630.o
+obj-$(CONFIG_I2C_SIS645)                += i2c-sis645.o
-obj-$(CONFIG_I2C_SAVAGE4)               += i2c-savage4.o
-obj-$(CONFIG_I2C_TSUNAMI)               += i2c-tsunami.o
@@ -1246 +1262 @@
-endif
-
+ifeq ($(CONFIG_I2C_SIS630),y)
+  L_OBJS += i2c-sis630.o
+else 
+  ifeq ($(CONFIG_I2C_SIS630),m)
+    M_OBJS += i2c-sis630.o
+  endif
+endif
+
+ifeq ($(CONFIG_I2C_SIS645),y)
+  L_OBJS += i2c-sis645.o
+else 
+  ifeq ($(CONFIG_I2C_SIS645),m)
+    M_OBJS += i2c-sis645.o
+  endif
+endif
+
-ifeq ($(CONFIG_I2C_SAVAGE4),y)
-  L_OBJS += i2c-savage4.o
@@ -1350 +1382 @@
-        extern int i2c_sis5595_init(void);
-#endif
+#ifdef CONFIG_I2C_SIS630
+        extern int i2c_sis630_init(void);
+#endif
+#ifdef CONFIG_I2C_SIS645
+        extern int sis645_init(void);
+#endif
-#ifdef CONFIG_I2C_SAVAGE4
-        extern int i2c_savage4_init(void);
@@ -1391 +1429 @@
-#ifdef CONFIG_I2C_SIS5595
-        i2c_sis5595_init();
+#endif
+#ifdef CONFIG_I2C_SIS630
+        i2c_sis630_init();
+#endif
+#ifdef CONFIG_I2C_SIS645
+        sis645_init();
-#endif
-#ifdef CONFIG_I2C_SAVAGE4