diff mbox series

[2/2,SRU,C] UBUNTU: [Config] update configs and annotations for ASIX renamed

Message ID 20190625022549.924-4-acelan.kao@canonical.com
State New
Headers show
Series None | expand

Commit Message

AceLan Kao June 25, 2019, 2:25 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1834114

Below commit rename the asix.ko module in net/phy to ax88796b.ko,
so update configs and annotations, too.
   net: phy: rename Asix Electronics PHY driver

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7e6b35a739b8..5a5276230836 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5633,7 +5633,7 @@  CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
 CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1d1deec22291..8573d7253dc0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -692,7 +692,6 @@  CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
-CONFIG_ASIX_PHY=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_ASUS_LAPTOP=m
@@ -835,6 +834,7 @@  CONFIG_AUTO_ZRELADDR=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX88796=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AX88796_93CX6 is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m