i2c-parport: Add SMBus alert support

[net-next-2.6.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 5f318ce29770228dfe7c179ee7fc4f79fbb38805..4d65546ede44368d66da376900205a77b1ba6238 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -77,7 +77,7 @@ config I2C_AMD8111
          will be called i2c-amd8111.
 
 config I2C_I801
-       tristate "Intel 82801 (ICH)"
+       tristate "Intel 82801 (ICH/PCH)"
        depends on PCI
        help
          If you say yes to this option, support will be included for the Intel
@@ -97,7 +97,8 @@ config I2C_I801
            ICH9
            Tolapai
            ICH10
-           PCH
+           3400/5 Series (PCH)
+           Cougar Point (PCH)
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -564,12 +565,23 @@ config I2C_VERSATILE
          This driver can also be built as a module.  If so, the module
          will be called i2c-versatile.
 
+config I2C_OCTEON
+       tristate "Cavium OCTEON I2C bus support"
+       depends on CPU_CAVIUM_OCTEON
+       help
+         Say yes if you want to support the I2C serial bus on Cavium
+         OCTEON SOC.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-octeon.
+
 comment "External I2C/SMBus adapter drivers"
 
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on PARPORT
        select I2C_ALGOBIT
+       select I2C_SMBUS
        help
          This supports parallel port I2C adapters such as the ones made by
          Philips or Velleman, Analog Devices evaluation boards, and more.