VisionFive2 Linux kernel

author: Corentin Labbe <clabbe@baylibre.com> 2021-03-08 09:51:26 +0000 committer: David S. Miller <davem@davemloft.net> 2021-03-09 16:22:40 -0800 commit: 69264b4a43aff7307283e2bae29e9305ab6b7d47 parent: e5e8b80d352ec999d2bba3ea584f541c83f4ca3f

Commit Summary:

sparc: sparc64_defconfig: remove duplicate CONFIGs

Diffstat:

1 file changed, 1 insertion, 3 deletions

diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index 148f44b33890..12a4fb0bd52a 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -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