diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /arch/arm/configs/collie_defconfig | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'arch/arm/configs/collie_defconfig')
| -rw-r--r-- | arch/arm/configs/collie_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index 4264e273202d..f7622e658163 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
| @@ -166,7 +166,6 @@ CONFIG_PCMCIA_SA1100=y | |||
| 166 | # Kernel Features | 166 | # Kernel Features |
| 167 | # | 167 | # |
| 168 | # CONFIG_PREEMPT is not set | 168 | # CONFIG_PREEMPT is not set |
| 169 | # CONFIG_NO_IDLE_HZ is not set | ||
| 170 | CONFIG_HZ=100 | 169 | CONFIG_HZ=100 |
| 171 | # CONFIG_AEABI is not set | 170 | # CONFIG_AEABI is not set |
| 172 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 171 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |