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-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
ep93xx_defconfig
diff --git
a/arch/arm/configs/ep93xx_defconfig
b/arch/arm/configs/ep93xx_defconfig
index 3fb083b81b0a53b41c06b3617a7c2bf2ee7cf07c..35d735ede9b802a6e4f4e46f334c0fef44f4988d 100644
(file)
--- a/
arch/arm/configs/ep93xx_defconfig
+++ b/
arch/arm/configs/ep93xx_defconfig
@@
-198,7
+198,6
@@
CONFIG_EP93XX_EARLY_UART1=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y