aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 23:55:21 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 23:55:21 -0500
commit116b23b0ed36f8d5b56d16ac50266fce8de904c1 (patch)
tree81f7c80bc2e691c327fe7572a4f9b517e47bb101 /drivers/net/Kconfig
parentb6ef977b608b01e0f338afd9445cab5436c61e00 (diff)
parent9e1402ab89623f08c8dc06ec395e3214e1ec7848 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] Fix an offset error when reading the CS89x0 ADD_PORT register [PATCH] spidernet: poor network performance [PATCH] Spidernet: remove ETH_ZLEN check in earlier patch [PATCH] bonding: fix an oops when slave device does not provide get_stats [PATCH] drivers/net: SAA9730: Fix build error Revert "[PATCH] zd1211rw: Removed unneeded packed attributes" [PATCH] zd1211rw: Fix of a locking bug [PATCH] softmac: remove netif_tx_disable when scanning [PATCH] ieee80211: Fix kernel panic when QoS is enabled
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b6c70c58ae99..d3abf80ea3e2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1769,8 +1769,8 @@ config VIA_RHINE_NAPI
1769 information. 1769 information.
1770 1770
1771config LAN_SAA9730 1771config LAN_SAA9730
1772 bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)" 1772 bool "Philips SAA9730 Ethernet support"
1773 depends on NET_PCI && EXPERIMENTAL && MIPS 1773 depends on NET_PCI && PCI && MIPS_ATLAS
1774 help 1774 help
1775 The SAA9730 is a combined multimedia and peripheral controller used 1775 The SAA9730 is a combined multimedia and peripheral controller used
1776 in thin clients, Internet access terminals, and diskless 1776 in thin clients, Internet access terminals, and diskless