]> git.baikalelectronics.ru Git - kernel.git/commit
net: phy: rename Asix Electronics PHY driver
authorMichael Schmitz <schmitzmic@gmail.com>
Fri, 7 Jun 2019 05:37:34 +0000 (17:37 +1200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 9 Jun 2019 20:24:17 +0000 (13:24 -0700)
commitaa8d3bfd2ae308c827b6a9cb93767b31e55a2613
treef8e94d3049a085232127c4c2b26e0956f3a2577c
parent6bea5cf99c832cc2ef4028d4c45526bcc4d34119
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 26166b393cf7 ("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: 26166b393cf7 ("net-next: phy: new Asix Electronics PHY driver")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/8390/Kconfig
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
drivers/net/phy/asix.c [deleted file]
drivers/net/phy/ax88796b.c [new file with mode: 0644]