Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize (95148229) · Commits · 方亚芬 / raspberrypi_linux

MAINTAINERS

+6 −5

Original line number	Diff line number	Diff line
		@@ -2113,7 +2113,7 @@ F: net/decnet/
		DEFXX FDDI NETWORK DRIVER
		M: "Maciej W. Rozycki" <macro@linux-mips.org>
		S: Maintained
		F: drivers/net/defxx.*
		F: drivers/net/fddi/defxx.*

		DELL LAPTOP DRIVER
		M: Matthew Garrett <mjg59@srcf.ucam.org>
		@@ -3049,6 +3049,7 @@ S: Maintained
		F: include/linux/hippidevice.h
		F: include/linux/if_hippi.h
		F: net/802/hippi.c
		F: drivers/net/hippi/

		HOST AP DRIVER
		M: Jouni Malinen <j@w1.fi>
		@@ -5066,7 +5067,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS
		M: Paul Mackerras <paulus@samba.org>
		L: linux-ppp@vger.kernel.org
		S: Maintained
		F: drivers/net/ppp_*
		F: drivers/net/ppp/ppp_*

		PPP OVER ATM (RFC 2364)
		M: Mitchell Blank Jr <mitch@sfgoth.com>
		@@ -5077,8 +5078,8 @@ F: include/linux/atmppp.h
		PPP OVER ETHERNET
		M: Michal Ostrowski <mostrows@earthlink.net>
		S: Maintained
		F: drivers/net/pppoe.c
		F: drivers/net/pppox.c
		F: drivers/net/ppp/pppoe.c
		F: drivers/net/ppp/pppox.c

		PPP OVER L2TP
		M: James Chapman <jchapman@katalix.com>
		@@ -5099,7 +5100,7 @@ PPTP DRIVER
		M: Dmitry Kozlov <xeb@mail.ru>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/pptp.c
		F: drivers/net/ppp/pptp.c
		W: http://sourceforge.net/projects/accel-pptp

		PREEMPTIBLE KERNEL

drivers/net/Kconfig

+138 −502

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/Makefile

+42 −52

Original line number	Diff line number	Diff line
		@@ -2,57 +2,61 @@
		# Makefile for the Linux network device drivers.
		#

		obj-$(CONFIG_MII) += mii.o
		obj-$(CONFIG_MDIO) += mdio.o
		obj-$(CONFIG_PHYLIB) += phy/
		obj-$(CONFIG_CAN) += can/
		obj-$(CONFIG_BONDING) += bonding/
		obj-$(CONFIG_VMXNET3) += vmxnet3/

		#
		# link order important here
		# Networking Core Drivers
		#
		obj-$(CONFIG_PLIP) += plip.o
		obj-$(CONFIG_ROADRUNNER) += rrunner.o
		obj-$(CONFIG_SKFP) += skfp/
		obj-$(CONFIG_RIONET) += rionet.o

		#
		# end link order section
		#

		obj-$(CONFIG_NET) += Space.o loopback.o
		obj-$(CONFIG_NET_SB1000) += sb1000.o
		obj-$(CONFIG_PPP) += ppp_generic.o
		obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
		obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
		obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
		obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
		obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
		obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
		obj-$(CONFIG_PPPOL2TP) += pppox.o
		obj-$(CONFIG_PPTP) += pppox.o pptp.o
		obj-$(CONFIG_SLIP) += slip.o
		obj-$(CONFIG_SLHC) += slhc.o

		obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
		obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/

		obj-$(CONFIG_BONDING) += bonding/
		obj-$(CONFIG_DUMMY) += dummy.o
		obj-$(CONFIG_EQUALIZER) += eql.o
		obj-$(CONFIG_IFB) += ifb.o
		obj-$(CONFIG_MACVLAN) += macvlan.o
		obj-$(CONFIG_MACVTAP) += macvtap.o
		obj-$(CONFIG_DEFXX) += defxx.o
		obj-$(CONFIG_EQUALIZER) += eql.o
		obj-$(CONFIG_MII) += mii.o
		obj-$(CONFIG_MDIO) += mdio.o
		obj-$(CONFIG_NET) += Space.o loopback.o
		obj-$(CONFIG_NETCONSOLE) += netconsole.o
		obj-$(CONFIG_PHYLIB) += phy/
		obj-$(CONFIG_RIONET) += rionet.o
		obj-$(CONFIG_TUN) += tun.o
		obj-$(CONFIG_VETH) += veth.o
		obj-$(CONFIG_VIRTIO_NET) += virtio_net.o

		#
		# Networking Drivers
		#
		obj-$(CONFIG_ARCNET) += arcnet/
		obj-$(CONFIG_DEV_APPLETALK) += appletalk/
		obj-$(CONFIG_CAIF) += caif/
		obj-$(CONFIG_CAN) += can/
		obj-$(CONFIG_ETRAX_ETHERNET) += cris/
		obj-$(CONFIG_ETHERNET) += ethernet/
		obj-$(CONFIG_FDDI) += fddi/
		obj-$(CONFIG_HIPPI) += hippi/
		obj-$(CONFIG_HAMRADIO) += hamradio/
		obj-$(CONFIG_IRDA) += irda/
		obj-$(CONFIG_PLIP) += plip/
		onj-$(CONFIG_PPP) += ppp/
		obj-$(CONFIG_PPP_ASYNC) += ppp/
		obj-$(CONFIG_PPP_BSDCOMP) += ppp/
		obj-$(CONFIG_PPP_DEFLATE) += ppp/
		obj-$(CONFIG_PPP_MPPE) += ppp/
		obj-$(CONFIG_PPP_SYNC_TTY) += ppp/
		obj-$(CONFIG_PPPOE) += ppp/
		obj-$(CONFIG_PPPOL2TP) += ppp/
		obj-$(CONFIG_PPTP) += ppp/
		onj-$(CONFIG_SLIP) += slip/
		obj-$(CONFIG_SLHC) += slip/
		obj-$(CONFIG_NET_SB1000) += sb1000.o
		onj-$(CONFIG_SLIP) += slip/
		obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
		obj-$(CONFIG_TR) += tokenring/
		obj-$(CONFIG_WAN) += wan/
		obj-$(CONFIG_ARCNET) += arcnet/
		obj-$(CONFIG_NET_PCMCIA) += pcmcia/
		obj-$(CONFIG_WLAN) += wireless/
		obj-$(CONFIG_WIMAX) += wimax/

		obj-$(CONFIG_VMXNET3) += vmxnet3/
		obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
		obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/

		obj-$(CONFIG_USB_CATC) += usb/
		obj-$(CONFIG_USB_KAWETH) += usb/
		@@ -63,17 +67,3 @@ obj-$(CONFIG_USB_USBNET) += usb/
		obj-$(CONFIG_USB_ZD1201) += usb/
		obj-$(CONFIG_USB_IPHETH) += usb/
		obj-$(CONFIG_USB_CDC_PHONET) += usb/

		obj-$(CONFIG_WLAN) += wireless/
		obj-$(CONFIG_HAMRADIO) += hamradio/
		obj-$(CONFIG_IRDA) += irda/
		obj-$(CONFIG_ETRAX_ETHERNET) += cris/

		obj-$(CONFIG_NETCONSOLE) += netconsole.o

		obj-$(CONFIG_VIRTIO_NET) += virtio_net.o

		obj-$(CONFIG_WIMAX) += wimax/
		obj-$(CONFIG_CAIF) += caif/

		obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

drivers/net/arcnet/Kconfig

+12 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		#

		menuconfig ARCNET
		depends on NETDEVICES && (ISA \|\| PCI)
		tristate "ARCnet support"
		depends on NETDEVICES && (ISA \|\| PCI \|\| PCMCIA)
		bool "ARCnet support"
		---help---
		If you have a network card of this type, say Y and check out the
		(arguably) beautiful poetry in
		@@ -123,4 +123,14 @@ config ARCNET_COM20020_PCI
		tristate "Support for COM20020 on PCI"
		depends on ARCNET_COM20020 && PCI

		config ARCNET_COM20020_CS
		tristate "COM20020 ARCnet PCMCIA support"
		depends on ARCNET_COM20020 && PCMCIA
		help
		Say Y here if you intend to attach this type of ARCnet PCMCIA card
		to your computer.

		To compile this driver as a module, choose M here: the module will be
		called com20020_cs. If unsure, say N.

		endif # ARCNET

drivers/net/arcnet/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,4 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o
		obj-$(CONFIG_ARCNET_COM20020) += com20020.o
		obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
		obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
		obj-$(CONFIG_ARCNET_COM20020_CS) += com20020_cs.o