diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 21:55:51 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 21:55:51 +1030 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /arch/m32r/Kconfig | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
| download | linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.gz linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.bz2 linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.zip | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'arch/m32r/Kconfig')
| -rw-r--r-- | arch/m32r/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 17a6dab09319..cabba332cc48 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -274,7 +274,7 @@ config GENERIC_CALIBRATE_DELAY bool default y -config SCHED_NO_NO_OMIT_FRAME_POINTER +config SCHED_OMIT_FRAME_POINTER bool default y |