diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-03-07 17:29:28 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-03-07 17:29:28 -0500 |
| commit | 3f4ae8605261e6f71e721e026bc18cb1851a7276 (patch) | |
| tree | 4ea1ec1d7c719653f82eeaabc6f3c7cdf0029feb /drivers/i2c/busses/Kconfig | |
| parent | 2086f848e0f7bd71d49a92c6acb127e3bf766907 (diff) | |
| parent | e1d5b6598cdc33257fe68302ae9db81d2f7bb883 (diff) | |
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 ecf079b7f931..02afe89de165 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -581,6 +581,16 @@ config I2C_OCTEON | |||
| 581 | This driver can also be built as a module. If so, the module | 581 | This driver can also be built as a module. If so, the module |
| 582 | will be called i2c-octeon. | 582 | will be called i2c-octeon. |
| 583 | 583 | ||
| 584 | config I2C_XILINX | ||
| 585 | tristate "Xilinx I2C Controller" | ||
| 586 | depends on EXPERIMENTAL && HAS_IOMEM | ||
| 587 | help | ||
| 588 | If you say yes to this option, support will be included for the | ||
| 589 | Xilinx I2C controller. | ||
| 590 | |||
| 591 | This driver can also be built as a module. If so, the module | ||
| 592 | will be called xilinx_i2c. | ||
| 593 | |||
| 584 | comment "External I2C/SMBus adapter drivers" | 594 | comment "External I2C/SMBus adapter drivers" |
| 585 | 595 | ||
| 586 | config I2C_PARPORT | 596 | config I2C_PARPORT |