diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /arch/sh/mm/Kconfig | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/sh/mm/Kconfig')
| -rw-r--r-- | arch/sh/mm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 1445ca6257df..09370392aff1 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
| @@ -168,6 +168,10 @@ config IOREMAP_FIXED | |||
| 168 | config UNCACHED_MAPPING | 168 | config UNCACHED_MAPPING |
| 169 | bool | 169 | bool |
| 170 | 170 | ||
| 171 | config HAVE_SRAM_POOL | ||
| 172 | bool | ||
| 173 | select GENERIC_ALLOCATOR | ||
| 174 | |||
| 171 | choice | 175 | choice |
| 172 | prompt "Kernel page size" | 176 | prompt "Kernel page size" |
| 173 | default PAGE_SIZE_4KB | 177 | default PAGE_SIZE_4KB |