diff options
| author |   Michael Schmitz <schmitzmic@gmail.com> | 2019-06-07 17:37:34 +1200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-09 13:24:17 -0700 |
| commit | a9520543b123bbd7275a0ab8d0375a5412683b41 (patch) | |
| tree | f8e94d3049a085232127c4c2b26e0956f3a2577c /drivers/net/phy/Kconfig | |
| parent | ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero (diff) | |
| download | linux-dev-a9520543b123bbd7275a0ab8d0375a5412683b41.tar.xz linux-dev-a9520543b123bbd7275a0ab8d0375a5412683b41.zip | |
net: phy: rename Asix Electronics PHY driver
[Resent to net instead of net-next - may clash with Anders Roxell's patch
series addressing duplicate module names]
Commit 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
introduced a new PHY driver drivers/net/phy/asix.c that causes a module
name conflict with a pre-existiting driver (drivers/net/usb/asix.c).
The PHY driver is used by the X-Surf 100 ethernet card driver, and loaded
by that driver via its PHY ID. A rename of the driver looks unproblematic.
Rename PHY driver to ax88796b.c in order to resolve name conflict.
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Fixes: 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/Kconfig')
| -rw-r--r-- | drivers/net/phy/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index f99f27800fdb..1d406c6df790 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -254,7 +254,7 @@ config AQUANTIA_PHY ---help--- Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405 -config ASIX_PHY +config AX88796B_PHY tristate "Asix PHYs" help Currently supports the Asix Electronics PHY found in the X-Surf 100 |