diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/arm/configs/ixp23xx_defconfig | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
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 |