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

Commit fc228a04 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 9fcc2e8a 8a212ab6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@

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

    <chapter>
+16 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ Driver documentation for yealink usb-p1k phones

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

The p1k is a relatively cheap usb 1.1 phone with:
  - keyboard		full support, yealink.ko / input event 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)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -28,6 +26,21 @@ the Makefile is pointing to the location where your kernel sources
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
~~~~~~~~~~~~~~~~~~~~
+0 −2
Original line number Diff line number Diff line
@@ -1517,8 +1517,6 @@ running once the system is up.
	uart6850=	[HW,OSS]
			Format: <io>,<irq>

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

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

+6 −14
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ M: ajk@iehk.rwth-aachen.de
L:	linux-hams@vger.kernel.org
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
P:	Jeff Garzik
M:	jgarzik@pobox.com
@@ -2495,14 +2489,6 @@ L: linux-kernel@vger.kernel.org
L:	linux-usb-devel@lists.sourceforge.net
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
P:	Greg Kroah-Hartman
M:	greg@kroah.com
@@ -2863,6 +2849,12 @@ M: jpr@f6fbb.org
L:	linux-hams@vger.kernel.org
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)
P:	Pete Zaitcev
M:	zaitcev@yahoo.com
+58 −40
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ config IA64_GENERIC
	select ACPI
	select NUMA
	select ACPI_NUMA
	select VIRTUAL_MEM_MAP
	select DISCONTIGMEM
	help
	  This selects the system type of your hardware.  A "generic" kernel
	  will run on any supported IA-64 system.  However, if you configure
@@ -176,40 +174,6 @@ config IA64_L1_CACHE_SHIFT
	default "6" if ITANIUM

# align cache-sensitive data to 64 bytes
config NUMA
	bool "NUMA support"
	depends on !IA64_HP_SIM
	default y if IA64_SGI_SN2
	select ACPI_NUMA
	help
	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
	  Access).  This option is for configuring high-end multiprocessor
	  server systems.  If in doubt, say N.

config VIRTUAL_MEM_MAP
	bool "Virtual mem map"
	default y if !IA64_HP_SIM
	help
	  Say Y to compile the kernel with support for a virtual mem map.
	  This code also only takes effect if a memory hole of greater than
	  1 Gb is found during boot.  You must turn this option on if you
	  require the DISCONTIGMEM option for your machine. If you are
	  unsure, say Y.

config HOLES_IN_ZONE
	bool
	default y if VIRTUAL_MEM_MAP

config ARCH_DISCONTIGMEM_ENABLE
	bool "Discontiguous memory support"
	depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
	default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
	help
	  Say Y to support efficient handling of discontiguous physical memory,
	  for architectures which are either NUMA (Non-Uniform Memory Access)
	  or have huge holes in the physical address space for other reasons.
	  See <file:Documentation/vm/numa> for more.

config IA64_CYCLONE
	bool "Cyclone (EXA) Time Source support"
	help
@@ -232,8 +196,10 @@ config IA64_SGI_SN_XP
	  based on a network adapter and DMA messaging.

config FORCE_MAX_ZONEORDER
	int
	default "18"
	int "MAX_ORDER (11 - 17)"  if !HUGETLB_PAGE
	range 11 17  if !HUGETLB_PAGE
	default "17" if HUGETLB_PAGE
	default "11"

config SMP
	bool "Symmetric multi-processing support"
@@ -254,8 +220,8 @@ config SMP
	  If you don't know what to do here, say N.

config NR_CPUS
	int "Maximum number of CPUs (2-512)"
	range 2 512
	int "Maximum number of CPUs (2-1024)"
	range 2 1024
	depends on SMP
	default "64"
	help
@@ -298,6 +264,58 @@ config PREEMPT

source "mm/Kconfig"

config ARCH_SELECT_MEMORY_MODEL
	def_bool y

config ARCH_DISCONTIGMEM_ENABLE
	def_bool y
	help
	  Say Y to support efficient handling of discontiguous physical memory,
	  for architectures which are either NUMA (Non-Uniform Memory Access)
	  or have huge holes in the physical address space for other reasons.
 	  See <file:Documentation/vm/numa> for more.

config ARCH_FLATMEM_ENABLE
	def_bool y

config ARCH_SPARSEMEM_ENABLE
	def_bool y
	depends on ARCH_DISCONTIGMEM_ENABLE

config ARCH_DISCONTIGMEM_DEFAULT
	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
	depends on ARCH_DISCONTIGMEM_ENABLE

config NUMA
	bool "NUMA support"
	depends on !IA64_HP_SIM && !FLATMEM
	default y if IA64_SGI_SN2
	help
	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
	  Access).  This option is for configuring high-end multiprocessor
	  server systems.  If in doubt, say N.

# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
# VIRTUAL_MEM_MAP has been retained for historical reasons.
config VIRTUAL_MEM_MAP
	bool "Virtual mem map"
	depends on !SPARSEMEM
	default y if !IA64_HP_SIM
	help
	  Say Y to compile the kernel with support for a virtual mem map.
	  This code also only takes effect if a memory hole of greater than
	  1 Gb is found during boot.  You must turn this option on if you
	  require the DISCONTIGMEM option for your machine. If you are
	  unsure, say Y.

config HOLES_IN_ZONE
	bool
	default y if VIRTUAL_MEM_MAP

config HAVE_ARCH_EARLY_PFN_TO_NID
	def_bool y
	depends on NEED_MULTIPLE_NODES

config IA32_SUPPORT
	bool "Support for Linux/x86 binaries"
	help
Loading