Commit fe218cfa authored by Michael Schmitz's avatar Michael Schmitz Committed by Greg Kroah-Hartman

net: phy: rename Asix Electronics PHY driver

[ Upstream commit a9520543 ]

[Resent to net instead of net-next - may clash with Anders Roxell's patch
series addressing duplicate module names]

Commit 31dd83b9 ("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: default avatarMichael Schmitz <schmitzmic@gmail.com>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Fixes: 31dd83b9 ("net-next: phy: new Asix Electronics PHY driver")
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6a38e8c3
...@@ -49,7 +49,7 @@ config XSURF100 ...@@ -49,7 +49,7 @@ config XSURF100
tristate "Amiga XSurf 100 AX88796/NE2000 clone support" tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
depends on ZORRO depends on ZORRO
select AX88796 select AX88796
select ASIX_PHY select AX88796B_PHY
help help
This driver is for the Individual Computers X-Surf 100 Ethernet This driver is for the Individual Computers X-Surf 100 Ethernet
card (based on the Asix AX88796 chip). If you have such a card, card (based on the Asix AX88796 chip). If you have such a card,
......
...@@ -242,7 +242,7 @@ config AQUANTIA_PHY ...@@ -242,7 +242,7 @@ config AQUANTIA_PHY
---help--- ---help---
Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405 Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
config ASIX_PHY config AX88796B_PHY
tristate "Asix PHYs" tristate "Asix PHYs"
help help
Currently supports the Asix Electronics PHY found in the X-Surf 100 Currently supports the Asix Electronics PHY found in the X-Surf 100
......
...@@ -51,7 +51,7 @@ ifdef CONFIG_HWMON ...@@ -51,7 +51,7 @@ ifdef CONFIG_HWMON
aquantia-objs += aquantia_hwmon.o aquantia-objs += aquantia_hwmon.o
endif endif
obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
obj-$(CONFIG_ASIX_PHY) += asix.o obj-$(CONFIG_AX88796B_PHY) += ax88796b.o
obj-$(CONFIG_AT803X_PHY) += at803x.o obj-$(CONFIG_AT803X_PHY) += at803x.o
obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment