summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2020-01-21 05:29:52 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2020-01-31 11:19:30 +0100
commitf3e96a71aaa9aa84fd40f93c417d3da917b8f13d (patch)
tree396ca9f322b8941dae592640d98c29881bd6d4c7
parentpowerpc/configs: Drop CONFIG_QLGE which moved to staging (diff)
downloadlinux-f3e96a71aaa9aa84fd40f93c417d3da917b8f13d.tar.xz
linux-f3e96a71aaa9aa84fd40f93c417d3da917b8f13d.zip
powerpc/configs: NET_CADENCE became NET_VENDOR_CADENCE
The NET_CADENCE symbol was renamed to NET_VENDOR_CADENCE, so we don't need to disable the former, see commit 0df5f81c481e ("net: ethernet: Add missing VENDOR to Cadence and Packet Engines symbols"). Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20200121043000.16212-2-mpe@ellerman.id.au
-rw-r--r--arch/powerpc/configs/skiroot_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig
index 7ff1ff1ddc28..eaaffe9ae8b9 100644
--- a/arch/powerpc/configs/skiroot_defconfig
+++ b/arch/powerpc/configs/skiroot_defconfig
@@ -138,7 +138,6 @@ CONFIG_TIGON3=m
CONFIG_BNX2X=m
# CONFIG_NET_VENDOR_BROCADE is not set
# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_CAVIUM is not set
CONFIG_CHELSIO_T1=m
# CONFIG_NET_VENDOR_CISCO is not set