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
           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
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
 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
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
 
           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
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
 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
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