diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 12:27:07 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 12:27:07 -0500 |
| commit | a58f67e70a6cad021ceebd1c8919b898dd5d5de3 (patch) | |
| tree | 78cb630cb31a8cbec17463f9acc0f766707c232f /arch/arm/mach-omap2/Kconfig | |
| parent | 4c6c826b22da9f6408b6bc6939a92aa0be838488 (diff) | |
| parent | 46e446db4fb2cdb2f1bc69d3981fa23738a42835 (diff) | |
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
* 'dt' of git://github.com/hzhuang1/linux: (6 commits)
Document: devicetree: add OF documents for arch-mmp
ARM: dts: append DTS file of pxa168
ARM: mmp: append OF support on pxa168
ARM: mmp: enable rtc clk in pxa168
i2c: pxa: add OF support
serial: pxa: add OF support
(plus update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 72ce50ecf328..3fdfaeb4ce20 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -363,8 +363,8 @@ config OMAP3_SDRC_AC_TIMING | |||
| 363 | going on could result in system crashes; | 363 | going on could result in system crashes; |
| 364 | 364 | ||
| 365 | config OMAP4_ERRATA_I688 | 365 | config OMAP4_ERRATA_I688 |
| 366 | bool "OMAP4 errata: Async Bridge Corruption (BROKEN)" | 366 | bool "OMAP4 errata: Async Bridge Corruption" |
| 367 | depends on ARCH_OMAP4 && BROKEN | 367 | depends on ARCH_OMAP4 |
| 368 | select ARCH_HAS_BARRIERS | 368 | select ARCH_HAS_BARRIERS |
| 369 | help | 369 | help |
| 370 | If a data is stalled inside asynchronous bridge because of back | 370 | If a data is stalled inside asynchronous bridge because of back |