diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /drivers/net/Kconfig | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | cb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a (diff) | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8aa8dd02b910..79eade7e9d91 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -440,10 +440,10 @@ config HPLANCE | |||
| 440 | 440 | ||
| 441 | config LASI_82596 | 441 | config 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 | ||
| 448 | config MIPS_JAZZ_SONIC | 448 | config MIPS_JAZZ_SONIC |
| 449 | tristate "MIPS JAZZ onboard SONIC Ethernet support" | 449 | tristate "MIPS JAZZ onboard SONIC Ethernet support" |