diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 17:02:24 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 17:02:30 +0200 |
| commit | 28f9f19db9dda54c851d5689539d86f6fc008773 (patch) | |
| tree | 469f5d7b24871b6fe001b7ad9acac859405f4822 /drivers/i2c | |
| parent | ARM: 5621/1: at91/dmaengine: integration of at_hdmac driver in at91sam9g45 se... (diff) | |
| parent | [ARM] pxafb: add accelerator ID for PXA3xx GCU (diff) | |
| download | linux-28f9f19db9dda54c851d5689539d86f6fc008773.tar.xz linux-28f9f19db9dda54c851d5689539d86f6fc008773.zip | |
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 8206442fbabd..834a03414900 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -460,8 +460,8 @@ config I2C_PNX will be called i2c-pnx. config I2C_PXA - tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)" - depends on EXPERIMENTAL && ARCH_PXA + tristate "Intel PXA2XX I2C adapter" + depends on ARCH_PXA || ARCH_MMP help If you have devices in the PXA I2C bus, say yes to this option. This driver can also be built as a module. If so, the module |