diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /arch/sh/Kconfig.cpu | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'arch/sh/Kconfig.cpu')
| -rw-r--r-- | arch/sh/Kconfig.cpu | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index cd6e3ea598d5..ddf096c7d8bf 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu | |||
| @@ -68,7 +68,8 @@ config SH_STORE_QUEUES | |||
| 68 | 68 | ||
| 69 | config SPECULATIVE_EXECUTION | 69 | config SPECULATIVE_EXECUTION |
| 70 | bool "Speculative subroutine return" | 70 | bool "Speculative subroutine return" |
| 71 | depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL | 71 | depends on EXPERIMENTAL |
| 72 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 | ||
| 72 | help | 73 | help |
| 73 | This enables support for a speculative instruction fetch for | 74 | This enables support for a speculative instruction fetch for |
| 74 | subroutine return. There are various pitfalls associated with | 75 | subroutine return. There are various pitfalls associated with |