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 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
rpc_defconfig
diff --git
a/arch/arm/configs/rpc_defconfig
b/arch/arm/configs/rpc_defconfig
index a29d61fe4c6aea11ba18e55221a080a671337c7e..e9124a00039357ea3de4c884c541ce564d674982 100644
(file)
--- a/
arch/arm/configs/rpc_defconfig
+++ b/
arch/arm/configs/rpc_defconfig
@@
-150,7
+150,6
@@
CONFIG_ARCH_ACORN=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM610=y
CONFIG_CPU_ARM710=y
CONFIG_CPU_SA110=y