Commit 30e714c1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "ARM: mvebu: config changes for v4.3" from Gregory Clement:

mvebu config changes for v4.3 (part #1)

update mvebu_v7_defconfig with features needed for Armada 388 GP

* tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: update mvebu_v7_defconfig with features needed for Armada 388 GP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 91e2213b adfe5f26
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_PXA3xx=y
CONFIG_MTD_SPI_NOR=y
CONFIG_EEPROM_AT24=y
CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
CONFIG_AHCI_MVEBU=y
@@ -83,11 +84,14 @@ CONFIG_I2C_MV64XXX=y
CONFIG_SPI=y
CONFIG_SPI_ORION=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_PCA953X=y
CONFIG_SENSORS_GPIO_FAN=y
CONFIG_THERMAL=y
CONFIG_ARMADA_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y