summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-11-18 18:05:16 +0100
committerKyle McMartin <kyle@ubuntu.com>2006-12-08 06:34:43 +0100
commit6de187ee17058e7798357994696774a5c2c8a6d9 (patch)
tree1b986df78e275a4c0d544f874d44337aea7fe49b /drivers
parent[PARISC] lasi_82596: use BUILD_BUG_ON() and constify static array (diff)
downloadlinux-6de187ee17058e7798357994696774a5c2c8a6d9.tar.xz
linux-6de187ee17058e7798357994696774a5c2c8a6d9.zip
[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
config LASI_82596
tristate "Lasi ethernet"
- depends on NET_ETHERNET && PARISC && GSC_LASI
+ depends on NET_ETHERNET && GSC
help
- Say Y here to support the on-board Intel 82596 ethernet controller
- built into Hewlett-Packard PA-RISC machines.
+ Say Y here to support the builtin Intel 82596 ethernet controller
+ found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
config MIPS_JAZZ_SONIC
tristate "MIPS JAZZ onboard SONIC Ethernet support"