The Kconfig symbol ASIX_PHY was renamed to AX88796B_PHY in v5.2-rc6, see
upstream commit a9520543b123 ("net: phy: rename Asix Electronics PHY
driver"). CONFIG_AX88796B_PHY is already used in the configuration generation
system, so we can safely remove CONFIG_ASIX_PHY from that system.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
Bravely untested!
configs/fedora/generic/CONFIG_ASIX_PHY | 1 -
kernel-aarch64-debug.config | 1 -
kernel-aarch64.config | 1 -
kernel-armv7hl-debug.config | 1 -
kernel-armv7hl-lpae-debug.config | 1 -
kernel-armv7hl-lpae.config | 1 -
kernel-armv7hl.config | 1 -
kernel-i686-debug.config | 1 -
kernel-i686.config | 1 -
kernel-ppc64le-debug.config | 1 -
kernel-ppc64le.config | 1 -
kernel-s390x-debug.config | 1 -
kernel-s390x.config | 1 -
kernel-x86_64-debug.config | 1 -
kernel-x86_64.config | 1 -
15 files changed, 15 deletions(-)
delete mode 100644 configs/fedora/generic/CONFIG_ASIX_PHY
diff --git a/configs/fedora/generic/CONFIG_ASIX_PHY
b/configs/fedora/generic/CONFIG_ASIX_PHY
deleted file mode 100644
index 37bb545c7379..000000000000
--- a/configs/fedora/generic/CONFIG_ASIX_PHY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ASIX_PHY is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 09b0dc7b4848..3d34488611bc 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -380,7 +380,6 @@ CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 25398e15cccf..a7a56d219249 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -380,7 +380,6 @@ CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ba671f3c3ac6..2af4b888be95 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -374,7 +374,6 @@ CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
CONFIG_ARM_ZYNQ_CPUIDLE=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 06b928317038..6acc262c514a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -361,7 +361,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b9c5c1d4d64c..3e4f2009ea57 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -361,7 +361,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 10da3c33de83..cf36f416d78d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -374,7 +374,6 @@ CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
CONFIG_ARM_ZYNQ_CPUIDLE=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 5a2cf9ca31f0..78f81dca88ef 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -253,7 +253,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 20bb2ce2bdb2..f73340f85459 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -252,7 +252,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 16409acf7e02..2cdc0886ef5b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -197,7 +197,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5b0c3f69ce9f..a56d459cc19a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -196,7 +196,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 96824ecdd706..521f1c088f34 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -202,7 +202,6 @@ CONFIG_ARCH_RANDOM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index f4eb17728776..b2387858a4dd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -201,7 +201,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 4da580b9c88f..26e997be11af 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -255,7 +255,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index c737eb8ac471..93ddf4af43d6 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -254,7 +254,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
--
2.21.0