summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/mvebu_defconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-02-08 08:26:31 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-02-08 08:26:31 +0100
commit6f04ca2d07340bf87a68565651269e4e5cd93bed (patch)
tree4b6609ec24c05f3eb6bc1de2a74360f5c5c78616 /arch/arm/configs/mvebu_defconfig
parent2608e27f6e2d24a6ff23e45d177a312007496afa (diff)
parentc07b5e59640c16fb8e3e632fc7e3a44e0a0adb01 (diff)
downloadbarebox-6f04ca2d07340bf87a68565651269e4e5cd93bed.tar.gz
barebox-6f04ca2d07340bf87a68565651269e4e5cd93bed.tar.xz
Merge branch 'for-next/arm'
Diffstat (limited to 'arch/arm/configs/mvebu_defconfig')
-rw-r--r--arch/arm/configs/mvebu_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 6d1b021768..39372fd93b 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARCH_MVEBU=y
CONFIG_MACH_GLOBALSCALE_MIRABOX=y
+CONFIG_MACH_NETGEAR_RN104=y
CONFIG_MACH_LENOVO_IX4_300D=y
CONFIG_MACH_MARVELL_ARMADA_XP_GP=y
CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3=y