diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:50:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:51:06 -0400 |
| commit | f82989bde1cfa5e2b4614d8e4896d795dae418d9 (patch) | |
| tree | 970cd7c833fad85acbf00be335b0ae8c4991b375 /arch/arm/Kconfig | |
| parent | 695d82fae9160406acb9de204c471248abcc2a9f (diff) | |
| parent | 30c766bdeccf945615097ca185326c1d7199f023 (diff) | |
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
ARM: davinci: DA850: move da850_register_pm to .init.text
ARM: davinci: cpufreq: fix compiler warning
(update to v3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e575b608dd4e..4bd38cba8ed0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1281,7 +1281,7 @@ config ARM_ERRATA_743622 | |||
| 1281 | depends on CPU_V7 | 1281 | depends on CPU_V7 |
| 1282 | help | 1282 | help |
| 1283 | This option enables the workaround for the 743622 Cortex-A9 | 1283 | This option enables the workaround for the 743622 Cortex-A9 |
| 1284 | (r2p0..r2p2) erratum. Under very rare conditions, a faulty | 1284 | (r2p*) erratum. Under very rare conditions, a faulty |
| 1285 | optimisation in the Cortex-A9 Store Buffer may lead to data | 1285 | optimisation in the Cortex-A9 Store Buffer may lead to data |
| 1286 | corruption. This workaround sets a specific bit in the diagnostic | 1286 | corruption. This workaround sets a specific bit in the diagnostic |
| 1287 | register of the Cortex-A9 which disables the Store Buffer | 1287 | register of the Cortex-A9 which disables the Store Buffer |