git.openpandora.org
/
pandora-kernel.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...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
nhk8815_defconfig
diff --git
a/arch/arm/configs/nhk8815_defconfig
b/arch/arm/configs/nhk8815_defconfig
index
600cb27
..
92d9086
100644
(file)
--- a/
arch/arm/configs/nhk8815_defconfig
+++ b/
arch/arm/configs/nhk8815_defconfig
@@
-191,7
+191,6
@@
CONFIG_I2C_BITBANG_8815NHK=y
#
# Processor Type
#
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y