aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-11-18 12:05:16 -0500
committerKyle McMartin <kyle@ubuntu.com>2006-12-08 00:34:43 -0500
commit6de187ee17058e7798357994696774a5c2c8a6d9 (patch)
tree1b986df78e275a4c0d544f874d44337aea7fe49b /drivers
parent93ea774bf2d7f2b04ce4c57dbae08b5fa877296d (diff)
[PARISC] Make Lasi Ethernet depend on GSC only
If we separate out LASI and ASP support later, we'll need this. Plus, this makes it consistent with the ncr700 scsi driver. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9de0eed6755b..f59be5eeda9c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -440,10 +440,10 @@ config HPLANCE
440 440
441config LASI_82596 441config LASI_82596
442 tristate "Lasi ethernet" 442 tristate "Lasi ethernet"
443 depends on NET_ETHERNET && PARISC && GSC_LASI 443 depends on NET_ETHERNET && GSC
444 help 444 help
445 Say Y here to support the on-board Intel 82596 ethernet controller 445 Say Y here to support the builtin Intel 82596 ethernet controller
446 built into Hewlett-Packard PA-RISC machines. 446 found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
447 447
448config MIPS_JAZZ_SONIC 448config MIPS_JAZZ_SONIC
449 tristate "MIPS JAZZ onboard SONIC Ethernet support" 449 tristate "MIPS JAZZ onboard SONIC Ethernet support"