Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79b6f7ec authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'new-drivers' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 02a14164 c4e84bde
Loading
Loading
Loading
Loading
+46 −0
Original line number Diff line number Diff line
Copyright (c)  2003-2008 QLogic Corporation
QLogic Linux Networking HBA Driver

This program includes a device driver for Linux 2.6 that may be
distributed with QLogic hardware specific firmware binary file.
You may modify and redistribute the device driver code under the
GNU General Public License as published by the Free Software
Foundation (version 2 or a later version).

You may redistribute the hardware specific firmware binary file
under the following terms:

	1. Redistribution of source code (only if applicable),
	   must retain the above copyright notice, this list of
	   conditions and the following disclaimer.

	2. Redistribution in binary form must reproduce the above
	   copyright notice, this list of conditions and the
	   following disclaimer in the documentation and/or other
	   materials provided with the distribution.

	3. The name of QLogic Corporation may not be used to
	   endorse or promote products derived from this software
	   without specific prior written permission

REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
COMBINATION WITH THIS PROGRAM.
+20 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,13 @@ L: cbe-oss-dev@ozlabs.org
W:	http://www.ibm.com/developerworks/power/cell/
S:	Supported

CISCO 10G ETHERNET DRIVER
P:	Scott Feldman
M:	scofeldm@cisco.com
P:	Joe Eykholt
M:	jeykholt@cisco.com
S:	Supported

CFAG12864B LCD DRIVER
P:	Miguel Ojeda Sandonis
M:	miguel.ojeda.sandonis@gmail.com
@@ -2319,6 +2326,12 @@ L: video4linux-list@redhat.com
W:	http://www.ivtvdriver.org
S:	Maintained

JME NETWORK DRIVER
P:	Guo-Fu Tseng
M:	cooldavid@cooldavid.org
L:	netdev@vger.kernel.org
S:	Maintained

JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
P:	David Woodhouse
M:	dwmw2@infradead.org
@@ -3383,6 +3396,13 @@ M: linux-driver@qlogic.com
L:	netdev@vger.kernel.org
S:	Supported

QLOGIC QLGE 10Gb ETHERNET DRIVER
P:	Ron Mercer
M:	linux-driver@qlogic.com
M:	ron.mercer@qlogic.com
L:	netdev@vger.kernel.org
S:	Supported

QNX4 FILESYSTEM
P:	Anders Larsen
M:	al@alarsen.net
+39 −0
Original line number Diff line number Diff line
@@ -1840,6 +1840,17 @@ config NE_H8300
	  Say Y here if you want to use the NE2000 compatible
	  controller on the Renesas H8/300 processor.

config ATL2
	tristate "Atheros L2 Fast Ethernet support"
	depends on PCI
	select CRC32
	select MII
	help
	  This driver supports the Atheros L2 fast ethernet adapter.

	  To compile this driver as a module, choose M here.  The module
	  will be called atl2.

source "drivers/net/fs_enet/Kconfig"

endif # NET_ETHERNET
@@ -2302,6 +2313,18 @@ config ATL1E
	  To compile this driver as a module, choose M here.  The module
	  will be called atl1e.

config JME
	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
	depends on PCI
	select CRC32
	select MII
	---help---
	  This driver supports the PCI-Express gigabit ethernet adapters
	  based on JMicron JMC250 chipset.

	  To compile this driver as a module, choose M here. The module
	  will be called jme.

endif # NETDEV_1000

#
@@ -2377,6 +2400,13 @@ config EHEA
	  To compile the driver as a module, choose M here. The module
	  will be called ehea.

config ENIC
	tristate "E, the Cisco 10G Ethernet NIC"
	depends on PCI && INET
	select INET_LRO
	help
	  This enables the support for the Cisco 10G Ethernet card.

config IXGBE
	tristate "Intel(R) 10GbE PCI Express adapters support"
	depends on PCI && INET
@@ -2496,6 +2526,15 @@ config BNX2X
	  To compile this driver as a module, choose M here: the module
	  will be called bnx2x.  This is recommended.

config QLGE
	tristate "QLogic QLGE 10Gb Ethernet Driver Support"
	depends on PCI
	help
	  This driver supports QLogic ISP8XXX 10Gb Ethernet cards.

	  To compile this driver as a module, choose M here: the module
	  will be called qlge.

source "drivers/net/sfc/Kconfig"

endif # NETDEV_10000
+4 −0
Original line number Diff line number Diff line
@@ -15,9 +15,12 @@ obj-$(CONFIG_EHEA) += ehea/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_ATL1) += atlx/
obj-$(CONFIG_ATL2) += atlx/
obj-$(CONFIG_ATL1E) += atl1e/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_ENIC) += enic/
obj-$(CONFIG_JME) += jme.o

gianfar_driver-objs := gianfar.o \
		gianfar_ethtool.o \
@@ -128,6 +131,7 @@ obj-$(CONFIG_AX88796) += ax88796.o
obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
obj-$(CONFIG_QLA3XXX) += qla3xxx.o
obj-$(CONFIG_QLGE) += qlge/

obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+2 −0
Original line number Diff line number Diff line
obj-$(CONFIG_ATL1)	+= atl1.o
obj-$(CONFIG_ATL2)	+= atl2.o
Loading