sony-laptop: create from sony_acpi

Move drivers/acpi/sony_acpi.c to drivers/misc/sony-laptop.c with all the
necessary configuration.
The SONY_LAPTOP config option substitutes the old ACPI_SONY and is 'default n'
now.

Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 16 insertions, 17 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 364e6fe8ec35..f4f000abc4e9 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -252,21 +252,6 @@ config ACPI_TOSHIBA
           If you have a legacy free Toshiba laptop (such as the Libretto L1
           series), say Y.
 
-config ACPI_SONY
-        tristate "Sony Laptop Extras"
-        depends on X86 && ACPI
-        select BACKLIGHT_CLASS_DEVICE
-        default m
-          ---help---
-          This mini-driver drives the ACPI SNC device present in the
-          ACPI BIOS of the Sony Vaio laptops.
-
-          It gives access to some extra laptop functionalities. In
-          its current form, the only thing this driver does is letting
-          the user set or query the screen brightness.
-
-          Read <file:Documentation/acpi/sony_acpi.txt> for more information.
-
 config ACPI_CUSTOM_DSDT
         bool "Include Custom DSDT"
         depends on !STANDALONE
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 31b9ad2218af..bce7ca27b429 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
 obj-$(CONFIG_ACPI_SYSTEM)       += system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)        += debug.o
 obj-$(CONFIG_ACPI_NUMA)         += numa.o
-obj-$(CONFIG_ACPI_SONY)         += sony_acpi.o
 obj-$(CONFIG_ACPI_ASUS)         += asus_acpi.o
 obj-$(CONFIG_ACPI_IBM)          += ibm_acpi.o
 obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 00db31c314e0..78fc47ba9717 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -88,4 +88,18 @@ config MSI_LAPTOP
 
           If you have an MSI S270 laptop, say Y or M here.
 
+config SONY_LAPTOP
+        tristate "Sony Laptop Extras"
+        depends on X86 && ACPI
+        select BACKLIGHT_CLASS_DEVICE
+          ---help---
+          This mini-driver drives the ACPI SNC device present in the
+          ACPI BIOS of the Sony Vaio laptops.
+
+          It gives access to some extra laptop functionalities. In
+          its current form, the only thing this driver does is letting
+          the user set or query the screen brightness.
+
+          Read <file:Documentation/acpi/sony_acpi.txt> for more information.
+
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index c9e98ab021c5..f86f9dcfcfe5 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_LKDTM)		+= lkdtm.o
 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
diff --git a/drivers/acpi/sony_acpi.c b/drivers/misc/sony-laptop.c
index c01d98db2fc1..103657e1b449 100644
--- a/drivers/acpi/sony_acpi.c
+++ b/drivers/misc/sony-laptop.c
@@ -356,7 +356,7 @@ static int sony_acpi_add(struct acpi_device *device)
                                         NULL, &sony_backlight_properties);
 
                 if (IS_ERR(sony_backlight_device)) {
-                        printk(LOG_PFX "unable to register backlight device\n");
+                        printk(LOG_PFX "unable to register backlight device\n");
                         sony_backlight_device = NULL;
                 }
                 else