Commit 5eb38462 authored by Olof Johansson's avatar Olof Johansson

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

mvebu defconfig for 4.6 (part 1)

- Enable sound module needed for OpenRD in mvebu_v5_defconfig
- Add USB nop xceiv support in mvebu_v7_defconfig

* tag 'mvebu-defconfig-4.6-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu_v5_defconfig: Enable sound module needed for OpenRD
  ARM: mvebu: Add USB nop xceiv support in mvebu_v7_defconfig
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a8824bd6 e1995f55
......@@ -137,6 +137,7 @@ CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_KIRKWOOD_SOC=y
CONFIG_SND_SOC_ALC5623=y
CONFIG_SND_SOC_CS42L51_I2C=y
CONFIG_SND_SIMPLE_CARD=y
CONFIG_HID_DRAGONRISE=y
CONFIG_HID_GYRATION=y
......
......@@ -109,6 +109,7 @@ CONFIG_USB_XHCI_MVEBU=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_STORAGE=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment