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>
This commit is contained in:
Mattia Dongili 2007-02-07 20:01:53 +01:00 committed by Len Brown
parent 7df03b82ed
commit 91fbc1d311
5 changed files with 16 additions and 17 deletions

View File

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

View File

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

View File

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

View File

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

View File

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