summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/vexpress_defconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
commit5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch)
treea5679efee0260214cece15ba83938e4c6f007f11 /arch/arm/configs/vexpress_defconfig
parent05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff)
parentba927c778091295310fdb105e10c257a0cfc61a3 (diff)
downloadbarebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz
barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs/vexpress_defconfig')
-rw-r--r--arch/arm/configs/vexpress_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig
index f6a57de75c..149ba17321 100644
--- a/arch/arm/configs/vexpress_defconfig
+++ b/arch/arm/configs/vexpress_defconfig
@@ -46,7 +46,6 @@ CONFIG_CMD_OFTREE=y
CONFIG_NET=y
CONFIG_NET_NFS=y
CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
CONFIG_OF_BAREBOX_DRIVERS=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_DRIVER_NET_SMC91111=y