diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:42 -0500 |
| commit | 16bc67edeb49b531940b2ba6c183780a1b5c472d (patch) | |
| tree | 71b4bc48e47e54f2c0b3126d8f81d2f31b707ea8 /arch/m32r/Kconfig | |
| parent | f6630114d9198aa959ac95c131334c020038f253 (diff) | |
| parent | 047106adcc85e3023da210143a6ab8a55df9e0fc (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Pick up fixes that did not make it into .32.0
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m32r/Kconfig')
| -rw-r--r-- | arch/m32r/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index c41234f1b825..3a9319f93e89 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -11,6 +11,9 @@ config M32R | |||
| 11 | select HAVE_IDE | 11 | select HAVE_IDE |
| 12 | select HAVE_OPROFILE | 12 | select HAVE_OPROFILE |
| 13 | select INIT_ALL_POSSIBLE | 13 | select INIT_ALL_POSSIBLE |
| 14 | select HAVE_KERNEL_GZIP | ||
| 15 | select HAVE_KERNEL_BZIP2 | ||
| 16 | select HAVE_KERNEL_LZMA | ||
| 14 | 17 | ||
| 15 | config SBUS | 18 | config SBUS |
| 16 | bool | 19 | bool |