aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-08-03 13:40:42 +0200
committerDavid S. Miller <davem@davemloft.net>2021-08-03 13:05:25 +0100
commit47fd22f2b84765a2f7e3f150282497b902624547 (patch)
treee0b54866262d4b1d26a4ba957f349c6be5daada9 /drivers/net/Space.c
parent3c509: stop calling netdev_boot_setup_check (diff)
downloadlinux-dev-47fd22f2b84765a2f7e3f150282497b902624547.tar.xz
linux-dev-47fd22f2b84765a2f7e3f150282497b902624547.zip
cs89x0: rework driver configuration
There are two drivers in the cs89x0 file, with the CONFIG_CS89x0_PLATFORM symbol deciding which one is getting built. This is somewhat confusing and makes it more likely ton configure a driver that works nowhere. Split up the Kconfig option into separate ISA and PLATFORM drivers, with the ISA symbol explicitly connecting to the static probing in drivers/net/Space.c The two drivers are still mutually incompatible at compile time, which could be lifted by splitting them into multiple files, but in practice this will make no difference. The platform driver can now be enabled for compile-testing on non-ARM machines. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9196a26615cc..9f573f7ded3c 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -77,11 +77,9 @@ static struct devprobe2 isa_probes[] __initdata = {
#ifdef CONFIG_SMC9194
{smc_init, 0},
#endif
-#ifdef CONFIG_CS89x0
-#ifndef CONFIG_CS89x0_PLATFORM
+#ifdef CONFIG_CS89x0_ISA
{cs89x0_probe, 0},
#endif
-#endif
#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET) /* Intel */
{i82596_probe, 0}, /* I82596 */
#endif