diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/net/Config.in | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/net/Config.in')
| -rw-r--r-- | drivers/net/Config.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/Config.in b/drivers/net/Config.in index 01a8fae37..0a5d04a00 100644 --- a/drivers/net/Config.in +++ b/drivers/net/Config.in @@ -34,6 +34,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then tristate ' MACE (Power Mac ethernet) support' CONFIG_MACE tristate ' BMAC (G3 ethernet) support' CONFIG_BMAC tristate ' Symbios 53c885 (Synergy ethernet) support' CONFIG_NCR885E + tristate ' National DP83902AV (Oak ethernet) support' CONFIG_OAKNET fi if [ "$CONFIG_ZORRO" = "y" ]; then tristate ' Ariadne support' CONFIG_ARIADNE @@ -264,6 +265,6 @@ fi source drivers/net/wan/Config.in -if [ "$CONFIG_PCMCIA" != "n" ]; then +if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then source drivers/net/pcmcia/Config.in fi |