From: Michael Schmitz <schmitzmic@gmail.com>
To: netdev@vger.kernel.org
To: netdev@vger.kernel.org
Cc: schmitz@debian.org, Michael Schmitz <schmitzmic@gmail.com>,
sfr@canb.auug.org.au, davem@davemloft.net
Subject: [PATCH 2/3] net: 8390: switch X-Surf 100 driver to use ax88796b PHY
Date: Sat, 18 May 2019 08:25:17 +1200 [thread overview]
Message-ID: <1558124718-19209-3-git-send-email-schmitzmic@gmail.com> (raw)
In-Reply-To: <1558124718-19209-1-git-send-email-schmitzmic@gmail.com>
In-Reply-To: <20190514105649.512267cd@canb.auug.org.au>
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@gmail.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
next prev parent reply other threads:[~2019-05-17 20:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190514105649.512267cd@canb.auug.org.au>
2019-05-17 20:25 ` [PATCH 0/3] resolve module name conflict for asix PHY and USB modules Michael Schmitz
2019-05-17 21:20 ` Andrew Lunn
2019-05-18 1:17 ` Michael Schmitz
2019-05-17 20:25 ` [PATCH 1/3] net: phy: new ax88796b.c Asix Electronics PHY driver Michael Schmitz
2019-05-17 20:25 ` Michael Schmitz [this message]
2019-05-17 20:25 ` [PATCH 3/3] net: phy: remove old " Michael Schmitz
2019-05-18 1:14 ` [PATCH v2] net: phy: rename " Michael Schmitz
2019-05-18 14:20 ` Andrew Lunn
2019-05-18 17:48 ` Michael Schmitz
2019-05-18 18:04 ` Andrew Lunn
2019-06-07 5:37 ` [PATCH net v3] " Michael Schmitz
2019-06-07 13:00 ` Andrew Lunn
2019-06-08 1:54 ` Michael Schmitz
2019-06-09 20:24 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1558124718-19209-3-git-send-email-schmitzmic@gmail.com \
--to=schmitzmic@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=schmitz@debian.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).