Automatic merge of 'misc-fixes' branch from

[linux-2.6] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index edf8051da3b4ce02b2cbdabe0bfa1df5ad4ca2b8..a0018de3bef499f5485049c53ebe3196b786299c 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -123,6 +123,7 @@ config I2C_I801
            6300ESB
            ICH6
            ICH7
+           ESB2
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -236,7 +237,7 @@ config I2C_KEYWEST
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"
-       depends on I2C && PPC
+       depends on I2C && PPC32
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and