diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-03-07 22:29:28 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-03-07 22:29:28 +0000 |
| commit | 3f4ae8605261e6f71e721e026bc18cb1851a7276 (patch) | |
| tree | 4ea1ec1d7c719653f82eeaabc6f3c7cdf0029feb /drivers/i2c/busses/Kconfig | |
| parent | 2086f848e0f7bd71d49a92c6acb127e3bf766907 (diff) | |
| parent | e1d5b6598cdc33257fe68302ae9db81d2f7bb883 (diff) | |
| download | kernel_samsung_smdk4412-3f4ae8605261e6f71e721e026bc18cb1851a7276.zip kernel_samsung_smdk4412-3f4ae8605261e6f71e721e026bc18cb1851a7276.tar.gz kernel_samsung_smdk4412-3f4ae8605261e6f71e721e026bc18cb1851a7276.tar.bz2 | |
Merge branch 'next-i2c-xilinx' into next-i2c
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index ecf079b..02afe89 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -581,6 +581,16 @@ config I2C_OCTEON This driver can also be built as a module. If so, the module will be called i2c-octeon. +config I2C_XILINX + tristate "Xilinx I2C Controller" + depends on EXPERIMENTAL && HAS_IOMEM + help + If you say yes to this option, support will be included for the + Xilinx I2C controller. + + This driver can also be built as a module. If so, the module + will be called xilinx_i2c. + comment "External I2C/SMBus adapter drivers" config I2C_PARPORT |