aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-14 12:57:24 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-08-16 20:37:42 -0400
commit4f0c320be6164ab39af42867aa1ccf69475850b7 (patch)
tree2efea6d42d2c3d0cf25d4a14960f41805da21bae /arch/arm/configs
parent2815d447f6538d11d0fbe88a2f3418905922ca0d (diff)
ARM: shmobile: bockw_defconfig: Enable missing hardware support
Based on the DTS Notes: - MTD_SPI_NOR is a dependency for MTD_M25P80 since commit 03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI nor framework") and commit e43b20619bdb6c851dd7b49cbd15e52875a785d4 ("mtd: spi-nor: shorten Kconfig naming"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/bockw_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index e816140d81c5..70b3f451f065 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -55,6 +55,7 @@ CONFIG_MTD_BLOCK=y
55CONFIG_MTD_CFI=y 55CONFIG_MTD_CFI=y
56CONFIG_MTD_CFI_AMDSTD=y 56CONFIG_MTD_CFI_AMDSTD=y
57CONFIG_MTD_M25P80=y 57CONFIG_MTD_M25P80=y
58CONFIG_MTD_SPI_NOR=y
58CONFIG_SCSI=y 59CONFIG_SCSI=y
59CONFIG_BLK_DEV_SD=y 60CONFIG_BLK_DEV_SD=y
60CONFIG_NETDEVICES=y 61CONFIG_NETDEVICES=y
@@ -82,6 +83,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
82# CONFIG_HWMON is not set 83# CONFIG_HWMON is not set
83CONFIG_I2C=y 84CONFIG_I2C=y
84CONFIG_I2C_RCAR=y 85CONFIG_I2C_RCAR=y
86CONFIG_GPIO_RCAR=y
85CONFIG_REGULATOR=y 87CONFIG_REGULATOR=y
86CONFIG_MEDIA_SUPPORT=y 88CONFIG_MEDIA_SUPPORT=y
87CONFIG_MEDIA_CAMERA_SUPPORT=y 89CONFIG_MEDIA_CAMERA_SUPPORT=y