diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
| commit | 5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch) | |
| tree | a5679efee0260214cece15ba83938e4c6f007f11 /arch/arm/configs/versatilepb_arm1176_defconfig | |
| parent | 05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff) | |
| parent | ba927c778091295310fdb105e10c257a0cfc61a3 (diff) | |
| download | barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs/versatilepb_arm1176_defconfig')
| -rw-r--r-- | arch/arm/configs/versatilepb_arm1176_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/versatilepb_arm1176_defconfig b/arch/arm/configs/versatilepb_arm1176_defconfig index f51689fa27..284fbd1150 100644 --- a/arch/arm/configs/versatilepb_arm1176_defconfig +++ b/arch/arm/configs/versatilepb_arm1176_defconfig @@ -62,7 +62,6 @@ CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_SERIAL_AMBA_PL011=y |