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 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
onearm_defconfig
diff --git
a/arch/arm/configs/onearm_defconfig
b/arch/arm/configs/onearm_defconfig
index f8701fadb600c04dc10e95b0e9383197c5a66d2f..19b91dedc7feeed6817501869aaa72b191f81829 100644
(file)
--- a/
arch/arm/configs/onearm_defconfig
+++ b/
arch/arm/configs/onearm_defconfig
@@
-161,7
+161,6
@@
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y