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 branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', 'for-2639/i2c-tegra...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
realview-smp_defconfig
diff --git
a/arch/arm/configs/realview-smp_defconfig
b/arch/arm/configs/realview-smp_defconfig
index
5ca7a61
..
abe61bf
100644
(file)
--- a/
arch/arm/configs/realview-smp_defconfig
+++ b/
arch/arm/configs/realview-smp_defconfig
@@
-38,7
+38,7
@@
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_
ARM_INTEGRATOR
=y
+CONFIG_MTD_
PHYSMAP
=y
CONFIG_ARM_CHARLCD=y
CONFIG_NETDEVICES=y
CONFIG_SMSC_PHY=y