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
ARM: Merge s3c24xx-updates2
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
at91sam9260ek_defconfig
diff --git
a/arch/arm/configs/at91sam9260ek_defconfig
b/arch/arm/configs/at91sam9260ek_defconfig
index 98e2f3de4bc5819420c7f538fdfd2937a682e692..472ea11eedf14526904c701dd8102784ccead037 100644
(file)
--- a/
arch/arm/configs/at91sam9260ek_defconfig
+++ b/
arch/arm/configs/at91sam9260ek_defconfig
@@
-188,7
+188,6
@@
CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y