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/eseries_pxa_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/eseries_pxa_defconfig')
| -rw-r--r-- | arch/arm/configs/eseries_pxa_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index ed487b90dbed..493ecee24f94 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig | |||
| @@ -251,7 +251,6 @@ CONFIG_PCMCIA_PXA2XX=m | |||
| 251 | # Kernel Features | 251 | # Kernel Features |
| 252 | # | 252 | # |
| 253 | # CONFIG_PREEMPT is not set | 253 | # CONFIG_PREEMPT is not set |
| 254 | # CONFIG_NO_IDLE_HZ is not set | ||
| 255 | CONFIG_HZ=100 | 254 | CONFIG_HZ=100 |
| 256 | CONFIG_AEABI=y | 255 | CONFIG_AEABI=y |
| 257 | CONFIG_OABI_COMPAT=y | 256 | CONFIG_OABI_COMPAT=y |