summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-04 08:28:47 -0200
committerShawn Guo <shawn.guo@linaro.org>2014-11-04 19:00:01 +0800
commit89fbec5b97fbcf08db3a9cd93a340f21f95d38b8 (patch)
tree02895e7f92ef037079d072a6465bc0b377174f85 /arch/arm/configs/imx_v6_v7_defconfig
parentc72c553249bb73705f594e292a8f8750027fbcbe (diff)
ARM: imx: Fix the removal of CONFIG_SPI option
Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI selection was dropped by savedefconfig for imx_v4_v5_defconfig and imx_v6_v7_defconfig. In order to keep the same behaviour as previous kernel versions and avoid regressions, let's add CONFIG_SPI option back. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 8fca6e276b69..6790f1b3f3a1 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_IMX=y
+CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y