[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1558124718-19209-3-git-send-email-schmitzmic@gmail.com>
Date: Sat, 18 May 2019 08:25:17 +1200
From: Michael Schmitz <schmitzmic@...il.com>
To: netdev@...r.kernel.org
Cc: schmitz@...ian.org, Michael Schmitz <schmitzmic@...il.com>,
sfr@...b.auug.org.au, davem@...emloft.net
Subject: [PATCH 2/3] net: 8390: switch X-Surf 100 driver to use ax88796b PHY
The asix.c driver name causes a module name conflict with a driver
of the same name in drivers/net/usb. Select the new ax88796b PHY
driver when X-SURF 100 support is configured.
Signed-off-by: Michael Schmitz <schmitzmic@...il.com>
Fixes: 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
---
drivers/net/ethernet/8390/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index f2f0264..443b34e 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -49,7 +49,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,
--
1.9.1
Powered by blists - more mailing lists