diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /arch/sh/Kconfig | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 4df3570fe511..b940424f8ccc 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -16,7 +16,7 @@ config SUPERH | |||
| 16 | select HAVE_IOREMAP_PROT if MMU | 16 | select HAVE_IOREMAP_PROT if MMU |
| 17 | select HAVE_ARCH_TRACEHOOK | 17 | select HAVE_ARCH_TRACEHOOK |
| 18 | select HAVE_DMA_API_DEBUG | 18 | select HAVE_DMA_API_DEBUG |
| 19 | select HAVE_PERF_COUNTERS | 19 | select HAVE_PERF_EVENTS |
| 20 | select HAVE_KERNEL_GZIP | 20 | select HAVE_KERNEL_GZIP |
| 21 | select HAVE_KERNEL_BZIP2 | 21 | select HAVE_KERNEL_BZIP2 |
| 22 | select HAVE_KERNEL_LZMA | 22 | select HAVE_KERNEL_LZMA |