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

Commit f188291a authored by Len Brown's avatar Len Brown
Browse files

Pull thinkpad into release branch 



Conflicts:

	drivers/misc/Kconfig

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents cfaae3ee 836a53f4

Documentation/ibm-acpi.txt→Documentation/thinkpad-acpi.txt

+419 −166

File changed and moved.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -1632,15 +1632,6 @@ W: http://www.ia64-linux.org/ 
T:	git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git

S:	Maintained



IBM ACPI EXTRAS DRIVER

P:	Henrique de Moraes Holschuh

M:	ibm-acpi@hmh.eng.br

L:	ibm-acpi-devel@lists.sourceforge.net

W:	http://ibm-acpi.sourceforge.net

W:	http://thinkwiki.org/wiki/Ibm-acpi

T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

S:	Maintained



SN-IA64 (Itanium) SUB-PLATFORM

P:	Jes Sorensen

M:	jes@sgi.com
@@ -3121,6 +3112,15 @@ P: Chris Zankel 
M:	chris@zankel.net

S:	Maintained



THINKPAD ACPI EXTRAS DRIVER

P:	Henrique de Moraes Holschuh

M:	ibm-acpi@hmh.eng.br

L:	ibm-acpi-devel@lists.sourceforge.net

W:	http://ibm-acpi.sourceforge.net

W:	http://thinkwiki.org/wiki/Ibm-acpi

T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

S:	Maintained



UltraSPARC (sparc64):

P:	David S. Miller

M:	davem@davemloft.net

drivers/acpi/Kconfig

+0 −37
Original line number Diff line number Diff line
@@ -218,43 +218,6 @@ config ACPI_ASUS 
	  NOTE: This driver is deprecated and will probably be removed soon,

	  use asus-laptop instead.



config ACPI_IBM

	tristate "IBM ThinkPad Laptop Extras"

	depends on X86

	select BACKLIGHT_CLASS_DEVICE

	---help---

	  This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds

	  support for Fn-Fx key combinations, Bluetooth control, video

	  output switching, ThinkLight control, UltraBay eject and more.

	  For more information about this driver see <file:Documentation/ibm-acpi.txt>

	  and <http://ibm-acpi.sf.net/> .



	  If you have an IBM ThinkPad laptop, say Y or M here.



config ACPI_IBM_DOCK

	bool "Legacy Docking Station Support"

	depends on ACPI_IBM

	depends on ACPI_DOCK=n

	default n

	---help---

	  Allows the ibm_acpi driver to handle docking station events.

	  This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI.  It will

	  allow locking and removing the laptop from the docking station,

	  but will not properly connect PCI devices.



	  If you are not sure, say N here.



config ACPI_IBM_BAY

	bool "Legacy Removable Bay Support"

	depends on ACPI_IBM

	default y

	---help---

	  Allows the ibm_acpi driver to handle removable bays.  It will allow

	  disabling the device in the bay, and also generate notifications when

	  the bay lever is ejected or inserted.



	  If you are not sure, say Y here.



config ACPI_TOSHIBA

	tristate "Toshiba Laptop Extras"

	depends on X86

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o 
obj-$(CONFIG_ACPI_DEBUG)	+= debug.o

obj-$(CONFIG_ACPI_NUMA)		+= numa.o

obj-$(CONFIG_ACPI_ASUS)		+= asus_acpi.o

obj-$(CONFIG_ACPI_IBM)		+= ibm_acpi.o

obj-$(CONFIG_ACPI_TOSHIBA)	+= toshiba_acpi.o

obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o

obj-y				+= cm_sbs.o

drivers/misc/Kconfig

+51 −0
Original line number Diff line number Diff line
@@ -127,4 +127,55 @@ config SONY_LAPTOP_OLD 
	  ---help---

	  Build the sonypi driver compatibility code into the sony-laptop driver.



config THINKPAD_ACPI

	tristate "ThinkPad ACPI Laptop Extras"

	depends on X86 && ACPI

	select BACKLIGHT_CLASS_DEVICE

	select HWMON

	---help---

	  This is a driver for the IBM and Lenovo ThinkPad laptops. It adds

	  support for Fn-Fx key combinations, Bluetooth control, video

	  output switching, ThinkLight control, UltraBay eject and more.

	  For more information about this driver see 

	  <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .



	  This driver was formely known as ibm-acpi.



	  If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.



config THINKPAD_ACPI_DEBUG

	bool "Verbose debug mode"

	depends on THINKPAD_ACPI

	default n

	---help---

	  Enables extra debugging information, at the expense of a slightly

	  increase in driver size.



	  If you are not sure, say N here.



config THINKPAD_ACPI_DOCK

	bool "Legacy Docking Station Support"

	depends on THINKPAD_ACPI

	depends on ACPI_DOCK=n

	default n

	---help---

	  Allows the thinkpad_acpi driver to handle docking station events.

	  This support was made obsolete by the generic ACPI docking station

	  support (CONFIG_ACPI_DOCK).  It will allow locking and removing the

	  laptop from the docking station, but will not properly connect PCI

	  devices.



	  If you are not sure, say N here.



config THINKPAD_ACPI_BAY

	bool "Legacy Removable Bay Support"

	depends on THINKPAD_ACPI

	default y

	---help---

	  Allows the thinkpad_acpi driver to handle removable bays.  It will

	  eletrically disable the device in the bay, and also generate

	  notifications when the bay lever is ejected or inserted.



	  If you are not sure, say Y here.



endmenu