Commit 9ce3075c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (35 commits)
  Add support for the Davicom DM9161A PHY
  sky2: only disable 88e8056 on some boards
  sky2: 88e8071 support not ready
  skge: crash on shutdown/suspend
  sky2: fix oops on shutdown
  mlx4: don't use deprecated IRQ flags
  netxen_nic_main don't use deprecated irq flags
  Use menuconfig objects II - netdev/wan
  Use menuconfig objects II - netdev/pcmcia
  Use menuconfig objects II - netdev/atm
  Use menuconfig objects: netdev
  Use menuconfig objects: PHY
  spidernet: remove unnecessary accesses to phy
  S2IO: Statistics for link up/down and memory allocated/freed
  S2IO: statistics for memory allocation failuers
  S2IO: getringparam ethtool option
  [PATCH] libertas: 64-bit cleanups
  [PATCH] libertas: sparse fixes
  [PATCH] libertas: fix missing unlock in TX error path
  [PATCH] libertas: make debugfs.c sparse-clean
  ...
parents b3b7cc7b 17cf8cc9

drivers/atm/Kconfig

+17 −15
Original line number Diff line number Diff line
@@ -2,19 +2,22 @@ 
# ATM device configuration

#



menu "ATM drivers"

menuconfig ATM_DRIVERS

	bool "ATM drivers"

	depends on NETDEVICES && ATM

	default y



if ATM_DRIVERS



config ATM_DUMMY

	tristate "Dummy ATM driver"

	depends on ATM

	help

	  Dummy ATM driver. Useful for proxy signalling, testing,

	  and development.  If unsure, say N.



config ATM_TCP

	tristate "ATM over TCP"

	depends on INET && ATM

	depends on INET

	help

	  ATM over TCP driver. Useful mainly for development and for

	  experiments. If unsure, say N.
@@ -30,7 +33,7 @@ config ATM_LANAI 


config ATM_ENI

	tristate "Efficient Networks ENI155P"

	depends on PCI && ATM

	depends on PCI

	---help---

	  Driver for the Efficient Networks ENI155p series and SMC ATM

	  Power155 155 Mbps ATM adapters. Both, the versions with 512KB and
@@ -139,7 +142,7 @@ config ATM_ENI_BURST_RX_2W 


config ATM_FIRESTREAM

	tristate "Fujitsu FireStream (FS50/FS155) "

	depends on PCI && ATM

	depends on PCI

	help

	  Driver for the Fujitsu FireStream 155 (MB86697) and

	  FireStream 50 (MB86695) ATM PCI chips.
@@ -149,7 +152,7 @@ config ATM_FIRESTREAM 


config ATM_ZATM

	tristate "ZeitNet ZN1221/ZN1225"

	depends on PCI && ATM

	depends on PCI

	help

	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM

	  adapters.
@@ -169,7 +172,7 @@ config ATM_ZATM_DEBUG 


config ATM_NICSTAR

	tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"

	depends on PCI && ATM && !64BIT

	depends on PCI && !64BIT

	help

	  The NICStAR chipset family is used in a large number of ATM NICs for

	  25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
@@ -202,7 +205,7 @@ config ATM_NICSTAR_USE_IDT77105 


config ATM_IDT77252

	tristate "IDT 77252 (NICStAR II)"

	depends on PCI && ATM

	depends on PCI

	help

	  Driver for the IDT 77252 ATM PCI chips.
@@ -237,7 +240,7 @@ config ATM_IDT77252_USE_SUNI 


config ATM_AMBASSADOR

	tristate "Madge Ambassador (Collage PCI 155 Server)"

	depends on PCI && ATM

	depends on PCI

	select BITREVERSE

	help

	  This is a driver for ATMizer based ATM card produced by Madge
@@ -262,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG 


config ATM_HORIZON

	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"

	depends on PCI && ATM

	depends on PCI

	help

	  This is a driver for the Horizon chipset ATM adapter cards once

	  produced by Madge Networks Ltd. Say Y (or M to compile as a module
@@ -286,7 +289,7 @@ config ATM_HORIZON_DEBUG 


config ATM_IA

	tristate "Interphase ATM PCI x575/x525/x531"

	depends on PCI && ATM && !64BIT

	depends on PCI && !64BIT

	---help---

	  This is a driver for the Interphase (i)ChipSAR adapter cards

	  which include a variety of variants in term of the size of the
@@ -319,7 +322,7 @@ config ATM_IA_DEBUG 


config ATM_FORE200E_MAYBE

	tristate "FORE Systems 200E-series"

	depends on (PCI || SBUS) && ATM

	depends on PCI || SBUS

	---help---

	  This is a driver for the FORE Systems 200E-series ATM adapter

	  cards. It simultaneously supports PCA-200E and SBA-200E models
@@ -436,7 +439,7 @@ config ATM_FORE200E 


config ATM_HE

	tristate "ForeRunner HE Series"

	depends on PCI && ATM

	depends on PCI

	help

	  This is a driver for the Marconi ForeRunner HE-series ATM adapter

	  cards. It simultaneously supports the 155 and 622 versions.
@@ -448,5 +451,4 @@ config ATM_HE_USE_SUNI 
	  Support for the S/UNI-Ultra and S/UNI-622 found in the ForeRunner

	  HE cards.  This driver provides carrier detection some statistics.



endmenu

endif # ATM

drivers/net/Kconfig

+12 −4
Original line number Diff line number Diff line
@@ -1898,8 +1898,12 @@ endmenu 
#	Gigabit Ethernet

#



menu "Ethernet (1000 Mbit)"

menuconfig NETDEV_1000

	bool "Ethernet (1000 Mbit)"

	depends on !UML

	default y



if NETDEV_1000



config ACENIC

	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2326,14 +2330,18 @@ config ATL1 
	  To compile this driver as a module, choose M here.  The module

	  will be called atl1.



endmenu

endif # NETDEV_1000



#

#	10 Gigabit Ethernet

#



menu "Ethernet (10000 Mbit)"

menuconfig NETDEV_10000

	bool "Ethernet (10000 Mbit)"

	depends on !UML

	default y



if NETDEV_10000



config CHELSIO_T1

        tristate "Chelsio 10Gb Ethernet support"
@@ -2507,7 +2515,7 @@ config MLX4_DEBUG 
	  debug_level module parameter (which can also be set after

	  the driver is loaded through sysfs).



endmenu

endif # NETDEV_10000



source "drivers/net/tokenring/Kconfig"

drivers/net/mlx4/eq.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ int __devinit mlx4_init_eq_table(struct mlx4_dev *dev) 
		priv->eq_table.eq[MLX4_EQ_CATAS].have_irq = 1;

	} else {

		err = request_irq(dev->pdev->irq, mlx4_interrupt,

				  SA_SHIRQ, DRV_NAME, dev);

				  IRQF_SHARED, DRV_NAME, dev);

		if (err)

			goto err_out_async;

drivers/net/netxen/netxen_nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static int netxen_nic_open(struct net_device *netdev) 
		}

		adapter->irq = adapter->ahw.pdev->irq;

		err = request_irq(adapter->ahw.pdev->irq, netxen_intr,

				  SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name,

				  IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name,

				  adapter);

		if (err) {

			printk(KERN_ERR "request_irq failed with: %d\n", err);

drivers/net/pcmcia/Kconfig

+7 −16
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@ 
# PCMCIA Network device configuration

#



menu "PCMCIA network device support"

	depends on NETDEVICES && PCMCIA!=n



config NET_PCMCIA

menuconfig NET_PCMCIA

	bool "PCMCIA network device support"

	depends on PCMCIA

	---help---

	  Say Y if you would like to include support for any PCMCIA or CardBus

	  network adapters, then say Y to the driver for your particular card
@@ -21,9 +19,10 @@ config NET_PCMCIA 


	  If unsure, say N.



if NET_PCMCIA



config PCMCIA_3C589

	tristate "3Com 3c589 PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	help

	  Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA

	  (PC-card) Ethernet card to your computer.
@@ -33,7 +32,6 @@ config PCMCIA_3C589 


config PCMCIA_3C574

	tristate "3Com 3c574 PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	help

	  Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA

	  (PC-card) Fast Ethernet card to your computer.
@@ -43,7 +41,6 @@ config PCMCIA_3C574 


config PCMCIA_FMVJ18X

	tristate "Fujitsu FMV-J18x PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	select CRC32

	help

	  Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
@@ -54,7 +51,6 @@ config PCMCIA_FMVJ18X 


config PCMCIA_PCNET

	tristate "NE2000 compatible PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	select CRC32

	help

	  Say Y here if you intend to attach an NE2000 compatible PCMCIA
@@ -65,7 +61,6 @@ config PCMCIA_PCNET 


config PCMCIA_NMCLAN

	tristate "New Media PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	help

	  Say Y here if you intend to attach a New Media Ethernet or LiveWire

	  PCMCIA (PC-card) Ethernet card to your computer.
@@ -75,7 +70,6 @@ config PCMCIA_NMCLAN 


config PCMCIA_SMC91C92

	tristate "SMC 91Cxx PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	select CRC32

	select MII

	help
@@ -87,7 +81,6 @@ config PCMCIA_SMC91C92 


config PCMCIA_XIRC2PS

	tristate "Xircom 16-bit PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	help

	  Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card)

	  Ethernet or Fast Ethernet card to your computer.
@@ -97,7 +90,6 @@ config PCMCIA_XIRC2PS 


config PCMCIA_AXNET

	tristate "Asix AX88190 PCMCIA support"

	depends on NET_PCMCIA && PCMCIA

	---help---

	  Say Y here if you intend to attach an Asix AX88190-based PCMCIA

	  (PC-card) Fast Ethernet card to your computer.  These cards are
@@ -109,7 +101,7 @@ config PCMCIA_AXNET 


config ARCNET_COM20020_CS

	tristate "COM20020 ARCnet PCMCIA support"

	depends on NET_PCMCIA && ARCNET_COM20020 && PCMCIA

	depends on ARCNET_COM20020

	help

	  Say Y here if you intend to attach this type of ARCnet PCMCIA card

	  to your computer.
@@ -119,7 +111,7 @@ config ARCNET_COM20020_CS 


config PCMCIA_IBMTR

	tristate "IBM PCMCIA tokenring adapter support"

	depends on NET_PCMCIA && IBMTR!=y && TR && PCMCIA && !64BIT

	depends on IBMTR!=y && TR && !64BIT

	help

	  Say Y here if you intend to attach this type of Token Ring PCMCIA

	  card to your computer. You then also need to say Y to "Token Ring
@@ -128,5 +120,4 @@ config PCMCIA_IBMTR 
	  To compile this driver as a module, choose M here: the module will be

	  called ibmtr_cs.



endmenu

endif # NET_PCMCIA

CRA Git | Maintained and supported by SUSTech CRA and CCSE