diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /arch/arm/configs/ixp23xx_defconfig | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/configs/ixp23xx_defconfig')
| -rw-r--r-- | arch/arm/configs/ixp23xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig index 27cf022dd807..4a2f7b2372db 100644 --- a/arch/arm/configs/ixp23xx_defconfig +++ b/arch/arm/configs/ixp23xx_defconfig | |||
| @@ -180,7 +180,6 @@ CONFIG_PCI=y | |||
| 180 | # Kernel Features | 180 | # Kernel Features |
| 181 | # | 181 | # |
| 182 | # CONFIG_PREEMPT is not set | 182 | # CONFIG_PREEMPT is not set |
| 183 | # CONFIG_NO_IDLE_HZ is not set | ||
| 184 | CONFIG_HZ=100 | 183 | CONFIG_HZ=100 |
| 185 | # CONFIG_AEABI is not set | 184 | # CONFIG_AEABI is not set |
| 186 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 185 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |