Merge tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu into next/defconfig (b654496a) · Commits · 戴 / test

Pull "mvebu defconfig changes for v3.19 (round 2)" from Jason Cooper: - mvebu - Add SDHCI, i2c, and MTD_BLOCK * tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu : ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig ARM: mvebu: enable i2c device in mvebu_v7_defconfig ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm/configs/mvebu_v7_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_MTD=y
		CONFIG_MTD_BLOCK=y
		CONFIG_MTD_CFI=y
		CONFIG_MTD_CFI_INTELEXT=y
		CONFIG_MTD_CFI_AMDSTD=y
		@@ -74,6 +75,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
		CONFIG_SERIAL_8250_DW=y
		CONFIG_SERIAL_OF_PLATFORM=y
		CONFIG_I2C=y
		CONFIG_I2C_CHARDEV=y
		CONFIG_I2C_MV64XXX=y
		CONFIG_SPI=y
		CONFIG_SPI_ORION=y
		@@ -100,6 +102,7 @@ CONFIG_MMC=y
		CONFIG_MMC_SDHCI=y
		CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_DOVE=y
		CONFIG_MMC_SDHCI_PXAV3=y
		CONFIG_MMC_MVSDIO=y
		CONFIG_LEDS_GPIO=y
		CONFIG_LEDS_CLASS=y

Admin message