git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/asoc' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
collie_defconfig
diff --git
a/arch/arm/configs/collie_defconfig
b/arch/arm/configs/collie_defconfig
index 4264e273202d21a9df214b818b1f409583d020d0..f7622e658163f54db175077d658a72e9f16d9cbd 100644
(file)
--- a/
arch/arm/configs/collie_defconfig
+++ b/
arch/arm/configs/collie_defconfig
@@
-166,7
+166,6
@@
CONFIG_PCMCIA_SA1100=y
# Kernel Features
#
# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
CONFIG_HZ=100
# CONFIG_AEABI is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y