diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
| commit | b9de5332bf4a2177a42304647f9534f717cfaa6f (patch) | |
| tree | 598c2e7e4c052da98c42cfbc3bafb2e715a97ce7 /arch/arm/configs/multi_v7_defconfig | |
| parent | Merge tag 'renesas-defconfig2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards (diff) | |
| parent | ARM: mvebu: update defconfigs for Armada 375 and 38x (diff) | |
| download | linux-dev-b9de5332bf4a2177a42304647f9534f717cfaa6f.tar.xz linux-dev-b9de5332bf4a2177a42304647f9534f717cfaa6f.zip | |
Merge tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu into next/boards
Merge "mvebu defconfig changes for v3.15" from Jason Cooper:
- dove
- remove UBI support
- enable watchdog
- mvebu
- rename mvebu_defconfig mvebu_v7_defconfig
- enable audio
- enable watchdog
- add Armada 375 and 38x
* tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update defconfigs for Armada 375 and 38x
ARM: dove: Enable watchdog support in the defconfig
ARM: mvebu: Enable watchdog support in defconfig
ARM: mvebu: enable audio options in mvebu_defconfig
ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfig
ARM: dove: Remove UBI support from defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ee6982976d66..56549f178fe3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -9,6 +9,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_MOBILE=y @@ -188,6 +190,8 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y |