summaryrefslogtreecommitdiff
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorAlex Gonzalez <alex.gonzalez@digi.com>2011-08-23 15:40:51 +0200
committerAlex Gonzalez <alex.gonzalez@digi.com>2011-08-29 16:26:30 +0200
commitf4f76ce5b562b6b1381337f65585031895505c9b (patch)
tree9afcc171c03294fb9ee68da68fa5d007083ca38d /drivers/i2c/busses
parent85f8681afee12b89a5c00b7975ee8dac77b3dbcb (diff)
ccwmx51: Enable the use of the i2c-imx driver.
With the current commit both the i2c-mxc and i2c-imx drivers can be used. The i2c-imx driver is still untested. Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 00b5921c4cf1..660a2f6d850d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -444,6 +444,7 @@ config I2C_MPC
config I2C_MXC
tristate "MXC I2C support"
depends on I2C && ARCH_MXC
+ depends on !I2C_IMX
help
If you say yes to this option, support will be included for Freescale
MXC I2C modules.
@@ -452,7 +453,7 @@ config I2C_MXC
config I2C_MXC_HS
tristate "MXC HIGH SPEED I2C support"
- depends on I2C && ARCH_MXC
+ depends on I2C && ARCH_MXC && !I2C_IMX
help
If you say yes to this option, support will be included for Freescale
MXC HIGH SPEED I2C modules.