diff options
| author | Michael Schmitz <schmitzmic@gmail.com> | 2019-06-07 07:37:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-09 22:24:17 +0200 |
| commit | a9520543b123bbd7275a0ab8d0375a5412683b41 (patch) | |
| tree | f8e94d3049a085232127c4c2b26e0956f3a2577c /net/mpls | |
| parent | ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero (diff) | |
| download | linux-a9520543b123bbd7275a0ab8d0375a5412683b41.tar.xz linux-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 'net/mpls')
0 files changed, 0 insertions, 0 deletions