diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/sh/Kconfig.cpu | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/sh/Kconfig.cpu')
| -rw-r--r-- | arch/sh/Kconfig.cpu | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index 0e27fe3b182b..c7d704381a6d 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu | |||
| @@ -104,6 +104,9 @@ config CPU_HAS_SR_RB | |||
| 104 | config CPU_HAS_PTEA | 104 | config CPU_HAS_PTEA |
| 105 | bool | 105 | bool |
| 106 | 106 | ||
| 107 | config CPU_HAS_PTEAEX | ||
| 108 | bool | ||
| 109 | |||
| 107 | config CPU_HAS_DSP | 110 | config CPU_HAS_DSP |
| 108 | bool | 111 | bool |
| 109 | 112 | ||