Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (1f419cad) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/DocBook/usb.tmpl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -291,7 +291,7 @@

	!Edrivers/usb/core/hcd.c		!Edrivers/usb/core/hcd.c
	!Edrivers/usb/core/hcd-pci.c		!Edrivers/usb/core/hcd-pci.c
	!Edrivers/usb/core/buffer.c		!Idrivers/usb/core/buffer.c
	</chapter>		</chapter>

	<chapter>		<chapter>

Documentation/input/yealink.txt

+16 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,6 @@ Driver documentation for yealink usb-p1k phones

	0. Status		0. Status
	~~~~~~~~~		~~~~~~~~~

	The p1k is a relatively cheap usb 1.1 phone with:		The p1k is a relatively cheap usb 1.1 phone with:
	- keyboard full support, yealink.ko / input event API		- keyboard full support, yealink.ko / input event API
	- LCD full support, yealink.ko / sysfs API		- LCD full support, yealink.ko / sysfs API
	@@ -17,9 +16,8 @@ For vendor documentation see http://www.yealink.com

	1. Compilation (stand alone version)		1. Compilation (stand alone version)
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

	Currently only kernel 2.6.x.y versions are supported.		Currently only kernel 2.6.x.y versions are supported.
	In order to build the yealink.ko module do:		In order to build the yealink.ko module do

	make		make

	@@ -28,6 +26,21 @@ the Makefile is pointing to the location where your kernel sources
	are located, default /usr/src/linux.		are located, default /usr/src/linux.


			1.1 Troubleshooting
			~~~~~~~~~~~~~~~~~~~
			Q: Module yealink compiled and installed without any problem but phone
			is not initialized and does not react to any actions.
			A: If you see something like:
			hiddev0: USB HID v1.00 Device [Yealink Network Technology Ltd. VOIP USB Phone
			in dmesg, it means that the hid driver has grabbed the device first. Try to
			load module yealink before any other usb hid driver. Please see the
			instructions provided by your distribution on module configuration.

			Q: Phone is working now (displays version and accepts keypad input) but I can't
			find the sysfs files.
			A: The sysfs files are located on the particular usb endpoint. On most
			distributions you can do: "find /sys/ -name get_icons" for a hint.


	2. keyboard features		2. keyboard features
	~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~

Documentation/kernel-parameters.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1517,8 +1517,6 @@ running once the system is up.
	uart6850= [HW,OSS]		uart6850= [HW,OSS]
	Format: <io>,<irq>		Format: <io>,<irq>

	usb-handoff [HW] Enable early USB BIOS -> OS handoff

	usbhid.mousepoll=		usbhid.mousepoll=
	[USBHID] The interval which mice are to be polled at.		[USBHID] The interval which mice are to be polled at.

MAINTAINERS

+6 −14

Original line number	Original line	Diff line number	Diff line
	@@ -116,12 +116,6 @@ M: ajk@iehk.rwth-aachen.de
	L: linux-hams@vger.kernel.org		L: linux-hams@vger.kernel.org
	S: Maintained		S: Maintained

	YEALINK PHONE DRIVER
	P: Henk Vergonet
	M: Henk.Vergonet@gmail.com
	L: usbb2k-api-dev@nongnu.org
	S: Maintained

	8139CP 10/100 FAST ETHERNET DRIVER		8139CP 10/100 FAST ETHERNET DRIVER
	P: Jeff Garzik		P: Jeff Garzik
	M: jgarzik@pobox.com		M: jgarzik@pobox.com
	@@ -2495,14 +2489,6 @@ L: linux-kernel@vger.kernel.org
	L: linux-usb-devel@lists.sourceforge.net		L: linux-usb-devel@lists.sourceforge.net
	S: Supported		S: Supported

	USB BLUETOOTH TTY CONVERTER DRIVER
	P: Greg Kroah-Hartman
	M: greg@kroah.com
	L: linux-usb-users@lists.sourceforge.net
	L: linux-usb-devel@lists.sourceforge.net
	S: Maintained
	W: http://www.kroah.com/linux-usb/

	USB CDC ETHERNET DRIVER		USB CDC ETHERNET DRIVER
	P: Greg Kroah-Hartman		P: Greg Kroah-Hartman
	M: greg@kroah.com		M: greg@kroah.com
	@@ -2863,6 +2849,12 @@ M: jpr@f6fbb.org
	L: linux-hams@vger.kernel.org		L: linux-hams@vger.kernel.org
	S: Maintained		S: Maintained

			YEALINK PHONE DRIVER
			P: Henk Vergonet
			M: Henk.Vergonet@gmail.com
			L: usbb2k-api-dev@nongnu.org
			S: Maintained

	YMFPCI YAMAHA PCI SOUND (Use ALSA instead)		YMFPCI YAMAHA PCI SOUND (Use ALSA instead)
	P: Pete Zaitcev		P: Pete Zaitcev
	M: zaitcev@yahoo.com		M: zaitcev@yahoo.com

drivers/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	# Rewritten to use lists instead of if-statements.		# Rewritten to use lists instead of if-statements.
	#		#

	obj-$(CONFIG_PCI) += pci/		obj-$(CONFIG_PCI) += pci/ usb/
	obj-$(CONFIG_PARISC) += parisc/		obj-$(CONFIG_PARISC) += parisc/
	obj-y += video/		obj-y += video/
	obj-$(CONFIG_ACPI) += acpi/		obj-$(CONFIG_ACPI) += acpi/