diff options
author | Mattia Dongili <malattia@linux.it> | 2007-04-30 22:19:53 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:42:45 -0400 |
commit | a64e62a07097f67108f0b68bc15216c3a4a5299b (patch) | |
tree | 581333abe45fc7295ef9d21060a8deea5212f758 /drivers/misc/sony-laptop.c | |
parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) |
sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index c15c1f61bd1b..8ee0321ef1c8 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include <asm/uaccess.h> | 63 | #include <asm/uaccess.h> |
64 | #include <linux/sonypi.h> | 64 | #include <linux/sonypi.h> |
65 | #include <linux/sony-laptop.h> | 65 | #include <linux/sony-laptop.h> |
66 | #ifdef CONFIG_SONY_LAPTOP_OLD | 66 | #ifdef CONFIG_SONYPI_COMPAT |
67 | #include <linux/poll.h> | 67 | #include <linux/poll.h> |
68 | #include <linux/miscdevice.h> | 68 | #include <linux/miscdevice.h> |
69 | #endif | 69 | #endif |
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(camera, | |||
114 | "set this to 1 to enable Motion Eye camera controls " | 114 | "set this to 1 to enable Motion Eye camera controls " |
115 | "(only use it if you have a C1VE or C1VN model)"); | 115 | "(only use it if you have a C1VE or C1VN model)"); |
116 | 116 | ||
117 | #ifdef CONFIG_SONY_LAPTOP_OLD | 117 | #ifdef CONFIG_SONYPI_COMPAT |
118 | static int minor = -1; | 118 | static int minor = -1; |
119 | module_param(minor, int, 0); | 119 | module_param(minor, int, 0); |
120 | MODULE_PARM_DESC(minor, | 120 | MODULE_PARM_DESC(minor, |
@@ -1504,7 +1504,7 @@ static struct attribute_group spic_attribute_group = { | |||
1504 | }; | 1504 | }; |
1505 | 1505 | ||
1506 | /******** SONYPI compatibility **********/ | 1506 | /******** SONYPI compatibility **********/ |
1507 | #ifdef CONFIG_SONY_LAPTOP_OLD | 1507 | #ifdef CONFIG_SONYPI_COMPAT |
1508 | 1508 | ||
1509 | /* battery / brightness / temperature addresses */ | 1509 | /* battery / brightness / temperature addresses */ |
1510 | #define SONYPI_BAT_FLAGS 0x81 | 1510 | #define SONYPI_BAT_FLAGS 0x81 |
@@ -1798,7 +1798,7 @@ static void sonypi_compat_exit(void) | |||
1798 | static int sonypi_compat_init(void) { return 0; } | 1798 | static int sonypi_compat_init(void) { return 0; } |
1799 | static void sonypi_compat_exit(void) { } | 1799 | static void sonypi_compat_exit(void) { } |
1800 | static void sonypi_compat_report_event(u8 event) { } | 1800 | static void sonypi_compat_report_event(u8 event) { } |
1801 | #endif /* CONFIG_SONY_LAPTOP_OLD */ | 1801 | #endif /* CONFIG_SONYPI_COMPAT */ |
1802 | 1802 | ||
1803 | /* | 1803 | /* |
1804 | * ACPI callbacks | 1804 | * ACPI callbacks |