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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
pnx4008_defconfig
diff --git
a/arch/arm/configs/pnx4008_defconfig
b/arch/arm/configs/pnx4008_defconfig
index 67b5f1e15f4a2bd222797261e4c1ec95a0944bf9..2f7b9ce7dad3c6264c443ce19efcac3941bd5bc6 100644
(file)
--- a/
arch/arm/configs/pnx4008_defconfig
+++ b/
arch/arm/configs/pnx4008_defconfig
@@
-121,7
+121,6
@@
CONFIG_ARCH_PNX4008=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y