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 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
85xx
/
xes_mpc85xx_defconfig
diff --git
a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index
5ea3124
..
1cd6fcb
100644
(file)
--- a/
arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/
arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@
-20,7
+20,7
@@
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_XES_MPC85xx=y
CONFIG_MODVERSIONS=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_XES_MPC85xx=y
-CONFIG_
MPC8xxx_GPIO
=y
+CONFIG_
GPIO_MPC8XXX
=y
CONFIG_HIGHMEM=y
CONFIG_MATH_EMULATION=y
CONFIG_SPARSE_IRQ=y
CONFIG_HIGHMEM=y
CONFIG_MATH_EMULATION=y
CONFIG_SPARSE_IRQ=y