Merge with Linus' kernel.

[powerpc.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 43f70db..f9fae28 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -2,17 +2,12 @@
 # Miscellaneous I2C chip drivers configuration
 #
 
 # Miscellaneous I2C chip drivers configuration
 #
 

-config I2C_SENSOR
-       tristate
-       default n
-

 menu "Miscellaneous I2C Chip support"
        depends on I2C
 
 config SENSORS_DS1337
        tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
        depends on I2C && EXPERIMENTAL
 menu "Miscellaneous I2C Chip support"
        depends on I2C
 
 config SENSORS_DS1337
        tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get support for Dallas Semiconductor
          DS1337 and DS1339 real-time clock chips.
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1337 and DS1339 real-time clock chips.


@@ -23,7 +18,6 @@ config SENSORS_DS1337
 config SENSORS_DS1374
        tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
        depends on I2C && EXPERIMENTAL
 config SENSORS_DS1374
        tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get support for Dallas Semiconductor
          DS1374 real-time clock chips.
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1374 real-time clock chips.


@@ -34,7 +28,6 @@ config SENSORS_DS1374
 config SENSORS_EEPROM
        tristate "EEPROM reader"
        depends on I2C && EXPERIMENTAL
 config SENSORS_EEPROM
        tristate "EEPROM reader"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get read-only access to the EEPROM data
          available on modern memory DIMMs and Sony Vaio laptops.  Such
        help
          If you say yes here you get read-only access to the EEPROM data
          available on modern memory DIMMs and Sony Vaio laptops.  Such


@@ -46,7 +39,6 @@ config SENSORS_EEPROM
 config SENSORS_PCF8574
        tristate "Philips PCF8574 and PCF8574A"
        depends on I2C && EXPERIMENTAL
 config SENSORS_PCF8574
        tristate "Philips PCF8574 and PCF8574A"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get support for Philips PCF8574 and 
          PCF8574A chips.
        help
          If you say yes here you get support for Philips PCF8574 and 
          PCF8574A chips.


@@ -67,7 +59,6 @@ config SENSORS_PCA9539
 config SENSORS_PCF8591
        tristate "Philips PCF8591"
        depends on I2C && EXPERIMENTAL
 config SENSORS_PCF8591
        tristate "Philips PCF8591"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get support for Philips PCF8591 chips.
 
        help
          If you say yes here you get support for Philips PCF8591 chips.
 


@@ -77,7 +68,6 @@ config SENSORS_PCF8591
 config SENSORS_RTC8564
        tristate "Epson 8564 RTC chip"
        depends on I2C && EXPERIMENTAL
 config SENSORS_RTC8564
        tristate "Epson 8564 RTC chip"
        depends on I2C && EXPERIMENTAL

-       select I2C_SENSOR

        help
          If you say yes here you get support for the Epson 8564 RTC chip.
 
        help
          If you say yes here you get support for the Epson 8564 RTC chip.
 


@@ -136,4 +126,13 @@ config SENSORS_MAX6875
          This driver can also be built as a module.  If so, the module
          will be called max6875.
 
          This driver can also be built as a module.  If so, the module
          will be called max6875.
 

+config RTC_X1205_I2C
+       tristate "Xicor X1205 RTC chip"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Xicor X1205 RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called x1205.
+

 endmenu
 endmenu