diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-08 13:59:29 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-08 13:59:29 -0800 |
| commit | 5eb38462589d822adcc297d0599d179f49ca0fe2 (patch) | |
| tree | 25b9055eb30d5e3f414d7ad22564cb26cc57a933 | |
| parent | a8824bd6a52658711024cf31f1c7b599bd0e530f (diff) | |
| parent | e1995f5586c9a60eefb188bc4ce3d4f37a6b835b (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index af29780accdc..9317e5a5b730 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig @@ -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 diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index c6729bf0a8dd..cf363abd974e 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -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 |