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 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
qil-a9260_defconfig
diff --git
a/arch/arm/configs/qil-a9260_defconfig
b/arch/arm/configs/qil-a9260_defconfig
index 9b32d0eb89bac0a93e09000f1ab2897ecc10b5bd..12d0d64e32161c5347aec7bc70bfe7a6800bcd64 100644
(file)
--- a/
arch/arm/configs/qil-a9260_defconfig
+++ b/
arch/arm/configs/qil-a9260_defconfig
@@
-195,7
+195,6
@@
CONFIG_AT91_EARLY_USART0=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y