diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
| commit | 9134d02bc0af4a8747d448d1f811ec5f8eb96df6 (patch) | |
| tree | 704c3e5dcc10f360815c4868a74711f82fb62e27 /drivers/i2c/busses/Kconfig | |
| parent | bbb20089a3275a19e475dbc21320c3742e3ca423 (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
Merge commit 'md/for-linus' into async-tx-next
Conflicts:
drivers/md/raid5.c
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index aa87b6a3bbef..8206442fbabd 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -328,6 +328,7 @@ config I2C_DAVINCI | |||
| 328 | 328 | ||
| 329 | config I2C_DESIGNWARE | 329 | config I2C_DESIGNWARE |
| 330 | tristate "Synopsys DesignWare" | 330 | tristate "Synopsys DesignWare" |
| 331 | depends on HAVE_CLK | ||
| 331 | help | 332 | help |
| 332 | If you say yes to this option, support will be included for the | 333 | If you say yes to this option, support will be included for the |
| 333 | Synopsys DesignWare I2C adapter. Only master mode is supported. | 334 | Synopsys DesignWare I2C adapter. Only master mode is supported. |