From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 29 Aug 2005 20:40:27 +0000 (-0400)
Subject: Merge /spare/repo/linux-2.6/
X-Git-Tag: v2.6.14-rc1~1025^2~1^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c1b054d03f5b31c33eaa0b267c629b118eaf3790;p=linux-2.6-omap-h63xx.git

Merge /spare/repo/linux-2.6/
---

c1b054d03f5b31c33eaa0b267c629b118eaf3790
diff --cc drivers/net/Kconfig
index 0313af45c1e,79e8aa6f2b9..a6a441b969f
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -2089,27 -2091,8 +2091,27 @@@ endmen
  #
  
  menu "Ethernet (10000 Mbit)"
- 	depends on NETDEVICES && !UML
+ 	depends on !UML
  
 +config CHELSIO_T1
 +        tristate "Chelsio 10Gb Ethernet support"
 +        depends on PCI
 +        help
 +          This driver supports Chelsio N110 and N210 models 10Gb Ethernet
 +          cards. More information about adapter features and performance
 +          tuning is in <file:Documentation/networking/cxgb.txt>.
 +
 +          For general information about Chelsio and our products, visit
 +          our website at <http://www.chelsio.com>.
 +
 +          For customer support, please visit our customer support page at
 +          <http://www.chelsio.com/support.htm>.
 +
 +          Please send feedback to <linux-bugs@chelsio.com>.
 +
 +          To compile this driver as a module, choose M here: the module
 +          will be called cxgb.
 +
  config IXGB
  	tristate "Intel(R) PRO/10GbE support"
  	depends on PCI