diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-12 03:14:11 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-12 03:14:11 +0100 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/char/sonypi.c | |
| parent | Merge branch 'bugzilla-11917' into release (diff) | |
| parent | ACPI: pci_link: remove acpi_irq_balance_set() interface (diff) | |
| download | linux-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.tar.xz linux-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.zip | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/char/sonypi.c')
| -rw-r--r-- | drivers/char/sonypi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 2457b07dabd6..f4374437a033 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -523,7 +523,7 @@ static int acpi_driver_registered; static int sonypi_ec_write(u8 addr, u8 value) { -#ifdef CONFIG_ACPI_EC +#ifdef CONFIG_ACPI if (SONYPI_ACPI_ACTIVE) return ec_write(addr, value); #endif @@ -539,7 +539,7 @@ static int sonypi_ec_write(u8 addr, u8 value) static int sonypi_ec_read(u8 addr, u8 *value) { -#ifdef CONFIG_ACPI_EC +#ifdef CONFIG_ACPI if (SONYPI_ACPI_ACTIVE) return ec_read(addr, value); #endif |