aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-03-23 16:34:00 -0400
committerLen Brown <len.brown@intel.com>2007-03-25 23:37:55 -0400
commit3ede41c718c7845905231019e42d05a3ed329515 (patch)
tree6cac5d3152f8fa55198544556cf6f03bae5f3bb6
parent38f996ed21089fa4ae40526a5f428e3c792ea561 (diff)
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: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/Kconfig37
-rw-r--r--drivers/acpi/Makefile1
-rw-r--r--drivers/misc/Kconfig37
-rw-r--r--drivers/misc/Makefile1
-rw-r--r--drivers/misc/ibm_acpi.c (renamed from drivers/acpi/ibm_acpi.c)0
-rw-r--r--drivers/misc/ibm_acpi.h (renamed from drivers/acpi/ibm_acpi.h)0
6 files changed, 38 insertions, 38 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index e2ce4a9c1c92..45c43150826b 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -218,43 +218,6 @@ config ACPI_ASUS
218 NOTE: This driver is deprecated and will probably be removed soon, 218 NOTE: This driver is deprecated and will probably be removed soon,
219 use asus-laptop instead. 219 use asus-laptop instead.
220 220
221config ACPI_IBM
222 tristate "IBM ThinkPad Laptop Extras"
223 depends on X86
224 select BACKLIGHT_CLASS_DEVICE
225 ---help---
226 This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
227 support for Fn-Fx key combinations, Bluetooth control, video
228 output switching, ThinkLight control, UltraBay eject and more.
229 For more information about this driver see <file:Documentation/ibm-acpi.txt>
230 and <http://ibm-acpi.sf.net/> .
231
232 If you have an IBM ThinkPad laptop, say Y or M here.
233
234config ACPI_IBM_DOCK
235 bool "Legacy Docking Station Support"
236 depends on ACPI_IBM
237 depends on ACPI_DOCK=n
238 default n
239 ---help---
240 Allows the ibm_acpi driver to handle docking station events.
241 This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI. It will
242 allow locking and removing the laptop from the docking station,
243 but will not properly connect PCI devices.
244
245 If you are not sure, say N here.
246
247config ACPI_IBM_BAY
248 bool "Legacy Removable Bay Support"
249 depends on ACPI_IBM
250 default y
251 ---help---
252 Allows the ibm_acpi driver to handle removable bays. It will allow
253 disabling the device in the bay, and also generate notifications when
254 the bay lever is ejected or inserted.
255
256 If you are not sure, say Y here.
257
258config ACPI_TOSHIBA 221config ACPI_TOSHIBA
259 tristate "Toshiba Laptop Extras" 222 tristate "Toshiba Laptop Extras"
260 depends on X86 223 depends on X86
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 5956e9f64a8b..92642ab15451 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o
55obj-$(CONFIG_ACPI_DEBUG) += debug.o 55obj-$(CONFIG_ACPI_DEBUG) += debug.o
56obj-$(CONFIG_ACPI_NUMA) += numa.o 56obj-$(CONFIG_ACPI_NUMA) += numa.o
57obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o 57obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
58obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o
59obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o 58obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o
60obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o 59obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
61obj-y += cm_sbs.o 60obj-y += cm_sbs.o
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 80b199fa0aa9..5d2bcbf1e3d4 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -122,4 +122,41 @@ config SONY_LAPTOP
122 122
123 Read <file:Documentation/sony-laptop.txt> for more information. 123 Read <file:Documentation/sony-laptop.txt> for more information.
124 124
125config ACPI_IBM
126 tristate "IBM ThinkPad Laptop Extras"
127 depends on X86 && ACPI
128 select BACKLIGHT_CLASS_DEVICE
129 ---help---
130 This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
131 support for Fn-Fx key combinations, Bluetooth control, video
132 output switching, ThinkLight control, UltraBay eject and more.
133 For more information about this driver see <file:Documentation/ibm-acpi.txt>
134 and <http://ibm-acpi.sf.net/> .
135
136 If you have an IBM ThinkPad laptop, say Y or M here.
137
138config ACPI_IBM_DOCK
139 bool "Legacy Docking Station Support"
140 depends on ACPI_IBM
141 depends on ACPI_DOCK=n
142 default n
143 ---help---
144 Allows the ibm_acpi driver to handle docking station events.
145 This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI. It will
146 allow locking and removing the laptop from the docking station,
147 but will not properly connect PCI devices.
148
149 If you are not sure, say N here.
150
151config ACPI_IBM_BAY
152 bool "Legacy Removable Bay Support"
153 depends on ACPI_IBM
154 default y
155 ---help---
156 Allows the ibm_acpi driver to handle removable bays. It will allow
157 disabling the device in the bay, and also generate notifications when
158 the bay lever is ejected or inserted.
159
160 If you are not sure, say Y here.
161
125endmenu 162endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 7793ccd79049..848b398482d9 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o
12obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o 12obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
13obj-$(CONFIG_SGI_IOC4) += ioc4.o 13obj-$(CONFIG_SGI_IOC4) += ioc4.o
14obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o 14obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
15obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/misc/ibm_acpi.c
index ae03b8f6f7be..ae03b8f6f7be 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/misc/ibm_acpi.c
diff --git a/drivers/acpi/ibm_acpi.h b/drivers/misc/ibm_acpi.h
index 7ebaaa40e183..7ebaaa40e183 100644
--- a/drivers/acpi/ibm_acpi.h
+++ b/drivers/misc/ibm_acpi.h