Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/i2c-2.5

Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/i2c-2.5
96a57f05 · Greg Kroah-Hartman · f01d7733 · daf99207 · 96a57f05 · 96a57f05
Commit 96a57f05 authored Apr 07, 2003 by Greg Kroah-Hartman
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 298 additions and 246 deletions

drivers/i2c/chips/Kconfig drivers/i2c/chips/Kconfig +3 -2

drivers/i2c/chips/via686a.c drivers/i2c/chips/via686a.c +295 -244

No files found.
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -66,7 +66,8 @@ config SENSORS_W83781D

 config I2C_SENSOR
 	tristate
-	depends on SENSORS_ADM1021 || SENSORS_LM75 || SENSORS_VIA686A || SENSORS_W83781D
-	default m
+	default y if SENSORS_ADM1021=y || SENSORS_LM75=y || SENSORS_VIA686A=y || SENSORS_W83781D=y
+	default m if SENSORS_ADM1021=m || SENSORS_LM75=m || SENSORS_VIA686A=m || SENSORS_W83781D=m
+	default n

 endmenu
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c