Commit 69264b4a authored Mar 08, 2021 by Corentin Labbe Committed by David S. Miller Mar 09, 2021

sparc: sparc64_defconfig: remove duplicate CONFIGs



After my patch there is CONFIG_ATA defined twice.
Remove the duplicate one.
Same problem for CONFIG_HAPPYMEAL, except I added as builtin for boot
test with NFS.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: a57cdeb3 ("sparc: sparc64_defconfig: add necessary configs for qemu")
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e5e8b80d

arch/sparc/configs/sparc64_defconfig

+1 −3

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ CONFIG_NETDEVICES=y
		CONFIG_NET_ETHERNET=y
		CONFIG_MII=m
		CONFIG_SUNLANCE=m
		CONFIG_HAPPYMEAL=m
		CONFIG_HAPPYMEAL=y
		CONFIG_SUNGEM=m
		CONFIG_SUNVNET=m
		CONFIG_LDMVSW=m
		@@ -234,9 +234,7 @@ CONFIG_CRYPTO_TWOFISH=m
		CONFIG_CRC16=m
		CONFIG_LIBCRC32C=m
		CONFIG_VCC=m
		CONFIG_ATA=y
		CONFIG_PATA_CMD64X=y
		CONFIG_HAPPYMEAL=y
		CONFIG_IP_PNP=y
		CONFIG_IP_PNP_DHCP=y
		CONFIG_DEVTMPFS=y