Skip to content

Commit

Permalink
sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
Browse files Browse the repository at this point in the history
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Mattia Dongili authored and Len Brown committed May 10, 2007
1 parent de56037 commit a64e62a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ config SONY_LAPTOP

Read <file:Documentation/sony-laptop.txt> for more information.

config SONY_LAPTOP_OLD
config SONYPI_COMPAT
bool "Sonypi compatibility"
depends on SONY_LAPTOP
---help---
Expand Down
8 changes: 4 additions & 4 deletions drivers/misc/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <asm/uaccess.h>
#include <linux/sonypi.h>
#include <linux/sony-laptop.h>
#ifdef CONFIG_SONY_LAPTOP_OLD
#ifdef CONFIG_SONYPI_COMPAT
#include <linux/poll.h>
#include <linux/miscdevice.h>
#endif
Expand Down Expand Up @@ -114,7 +114,7 @@ MODULE_PARM_DESC(camera,
"set this to 1 to enable Motion Eye camera controls "
"(only use it if you have a C1VE or C1VN model)");

#ifdef CONFIG_SONY_LAPTOP_OLD
#ifdef CONFIG_SONYPI_COMPAT
static int minor = -1;
module_param(minor, int, 0);
MODULE_PARM_DESC(minor,
Expand Down Expand Up @@ -1504,7 +1504,7 @@ static struct attribute_group spic_attribute_group = {
};

/******** SONYPI compatibility **********/
#ifdef CONFIG_SONY_LAPTOP_OLD
#ifdef CONFIG_SONYPI_COMPAT

/* battery / brightness / temperature addresses */
#define SONYPI_BAT_FLAGS 0x81
Expand Down Expand Up @@ -1798,7 +1798,7 @@ static void sonypi_compat_exit(void)
static int sonypi_compat_init(void) { return 0; }
static void sonypi_compat_exit(void) { }
static void sonypi_compat_report_event(u8 event) { }
#endif /* CONFIG_SONY_LAPTOP_OLD */
#endif /* CONFIG_SONYPI_COMPAT */

/*
* ACPI callbacks
Expand Down

0 comments on commit a64e62a

Please sign in to comment.