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] Commit31dd83b966
("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:31dd83b966
("net-next: phy: new Asix Electronics PHY driver") Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
65a3c497c0
commit
a9520543b1
|
@ -50,7 +50,7 @@ config XSURF100
|
|||
tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
|
||||
depends on ZORRO
|
||||
select AX88796
|
||||
select ASIX_PHY
|
||||
select AX88796B_PHY
|
||||
help
|
||||
This driver is for the Individual Computers X-Surf 100 Ethernet
|
||||
card (based on the Asix AX88796 chip). If you have such a card,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -52,7 +52,7 @@ ifdef CONFIG_HWMON
|
|||
aquantia-objs += aquantia_hwmon.o
|
||||
endif
|
||||
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_BCM63XX_PHY) += bcm63xx.o
|
||||
obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
|
||||
|
|
Loading…
Reference in New Issue