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/iop13xx_defconfig | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/arm/configs/iop13xx_defconfig')
| -rw-r--r-- | arch/arm/configs/iop13xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index 988b4d13e76f..482e57061053 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig | |||
| @@ -197,7 +197,6 @@ CONFIG_PCI_LEGACY=y | |||
| 197 | # | 197 | # |
| 198 | # CONFIG_TICK_ONESHOT is not set | 198 | # CONFIG_TICK_ONESHOT is not set |
| 199 | # CONFIG_PREEMPT is not set | 199 | # CONFIG_PREEMPT is not set |
| 200 | # CONFIG_NO_IDLE_HZ is not set | ||
| 201 | CONFIG_HZ=100 | 200 | CONFIG_HZ=100 |
| 202 | # CONFIG_AEABI is not set | 201 | # CONFIG_AEABI is not set |
| 203 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 202 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |