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

Commit 3ede41c7 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

ACPI: ibm-acpi: move driver to drivers/misc hierarchy 



ibm-acpi is not an ACPICA driver, so move it to drivers/misc as per Len
Brown's request.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 38f996ed

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

+37 −0
Original line number Diff line number Diff line
@@ -122,4 +122,41 @@ config SONY_LAPTOP 


	  Read <file:Documentation/sony-laptop.txt> for more information.



config ACPI_IBM

	tristate "IBM ThinkPad Laptop Extras"

	depends on X86 && ACPI

	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.



endmenu

drivers/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o 
obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o

obj-$(CONFIG_SGI_IOC4)		+= ioc4.o

obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o

obj-$(CONFIG_ACPI_IBM)		+= ibm_acpi.o

drivers/acpi/ibm_acpi.c→drivers/misc/ibm_acpi.c

+0 −0

File moved.

View file