adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-02 14:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT

Browse source 
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-05-01 11:19:53 +09:00 committed by Len Brown
parent de5603748a
commit a64e62a070
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/misc/Kconfig
View file

@ -130,7 +130,7 @@ config SONY_LAPTOP
Read <file:Documentation/sony-laptop.txt> for more information. Read <file:Documentation/sony-laptop.txt> for more information.
config SONY_LAPTOP_OLD config SONYPI_COMPAT
bool "Sonypi compatibility" bool "Sonypi compatibility"
depends on SONY_LAPTOP depends on SONY_LAPTOP
---help--- ---help---

8
drivers/misc/sony-laptop.c
View file

@ -63,7 +63,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/sonypi.h> #include <linux/sonypi.h>
#include <linux/sony-laptop.h> #include <linux/sony-laptop.h>
#ifdef CONFIG_SONY_LAPTOP_OLD #ifdef CONFIG_SONYPI_COMPAT
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#endif #endif
@ -114,7 +114,7 @@ MODULE_PARM_DESC(camera,
"set this to 1 to enable Motion Eye camera controls " "set this to 1 to enable Motion Eye camera controls "
"(only use it if you have a C1VE or C1VN model)"); "(only use it if you have a C1VE or C1VN model)");
#ifdef CONFIG_SONY_LAPTOP_OLD #ifdef CONFIG_SONYPI_COMPAT
static int minor = -1; static int minor = -1;
module_param(minor, int, 0); module_param(minor, int, 0);
MODULE_PARM_DESC(minor, MODULE_PARM_DESC(minor,
@ -1504,7 +1504,7 @@ static struct attribute_group spic_attribute_group = {
}; };
/******** SONYPI compatibility **********/ /******** SONYPI compatibility **********/
#ifdef CONFIG_SONY_LAPTOP_OLD #ifdef CONFIG_SONYPI_COMPAT
/* battery / brightness / temperature addresses */ /* battery / brightness / temperature addresses */
#define SONYPI_BAT_FLAGS 0x81 #define SONYPI_BAT_FLAGS 0x81
@ -1798,7 +1798,7 @@ static void sonypi_compat_exit(void)
static int sonypi_compat_init(void) { return 0; } static int sonypi_compat_init(void) { return 0; }
static void sonypi_compat_exit(void) { } static void sonypi_compat_exit(void) { }
static void sonypi_compat_report_event(u8 event) { } static void sonypi_compat_report_event(u8 event) { }
#endif /* CONFIG_SONY_LAPTOP_OLD */ #endif /* CONFIG_SONYPI_COMPAT */
/* /*
* ACPI callbacks * ACPI callbacks