[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (4/9)

All ISA hardware monitoring drivers (including hybrid drivers) now have
a hard dependency on i2c-isa, so they must select I2C_ISA. As a result,
CONFIG_I2C_ISA doesn't need to be left visible to the user. The good
thing here is that users will stop complaining that some driver doesn't
work just because they forgot to compile or load i2c-isa.

At this point, all drivers are working again and the cleanup phase can
begin.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 8c3911313700aaa33dd1e07a2bbd3250828d0aae..29583e1f7a20dead17c425777675d2a03cd0e471 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -160,6 +160,7 @@ config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
        depends on HWMON && I2C
        select I2C_SENSOR
+       select I2C_ISA
        help
          If you say yes here you get support for ITE IT87xx sensor chips
          and clones: SiS960.
@@ -211,6 +212,7 @@ config SENSORS_LM78
        tristate "National Semiconductor LM78 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
        select I2C_SENSOR
+       select I2C_ISA
        help
          If you say yes here you get support for National Semiconductor LM78,
          LM78-J and LM79.
@@ -366,6 +368,7 @@ config SENSORS_W83781D
        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
        depends on HWMON && I2C
        select I2C_SENSOR
+       select I2C_ISA
        help
          If you say yes here you get support for the Winbond W8378x series
          of sensor chips: the W83781D, W83782D, W83783S and W83627HF,

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a96dd9810a0e4014cefb46541054475..6e9da1372225b73ab74c304824be223c5f078592 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,14 +182,8 @@ config I2C_IOP3XX
          will be called i2c-iop3xx.
 
 config I2C_ISA
-       tristate "ISA Bus support"
+       tristate
        depends on I2C
-       help
-         If you say yes to this option, support will be included for i2c
-         interfaces that are on the ISA bus.
-
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-isa.
 
 config I2C_ITE
        tristate "ITE I2C Adapter"