diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:30 -0400 |
| commit | 28f9f19db9dda54c851d5689539d86f6fc008773 (patch) | |
| tree | 469f5d7b24871b6fe001b7ad9acac859405f4822 /drivers/i2c | |
| parent | 40262b2b6efac507005a2c981175266bf81152a7 (diff) | |
| parent | 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 8206442fbab..834a0341490 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -460,8 +460,8 @@ config I2C_PNX | |||
| 460 | will be called i2c-pnx. | 460 | will be called i2c-pnx. |
| 461 | 461 | ||
| 462 | config I2C_PXA | 462 | config I2C_PXA |
| 463 | tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)" | 463 | tristate "Intel PXA2XX I2C adapter" |
| 464 | depends on EXPERIMENTAL && ARCH_PXA | 464 | depends on ARCH_PXA || ARCH_MMP |
| 465 | help | 465 | help |
| 466 | If you have devices in the PXA I2C bus, say yes to this option. | 466 | If you have devices in the PXA I2C bus, say yes to this option. |
| 467 | This driver can also be built as a module. If so, the module | 467 | This driver can also be built as a module. If so, the module |