diff options
| 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 (patch) | |
| tree | a83374c8d4bebdb8d99f6cc10d038a4d0676796b | |
| parent | sparc64: Fix opcode filtering in handling of no fault loads (diff) | |
| download | linux-dev-69264b4a43aff7307283e2bae29e9305ab6b7d47.tar.xz linux-dev-69264b4a43aff7307283e2bae29e9305ab6b7d47.zip | |
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: a57cdeb369ef ("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>
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig | 4 |
1 files changed, 1 insertions, 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 |