diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 00:10:32 -0500 |
| commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
| tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/char/sonypi.c | |
| parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linux-2.6' into next
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; | |||
| 523 | 523 | ||
| 524 | static int sonypi_ec_write(u8 addr, u8 value) | 524 | static int sonypi_ec_write(u8 addr, u8 value) |
| 525 | { | 525 | { |
| 526 | #ifdef CONFIG_ACPI_EC | 526 | #ifdef CONFIG_ACPI |
| 527 | if (SONYPI_ACPI_ACTIVE) | 527 | if (SONYPI_ACPI_ACTIVE) |
| 528 | return ec_write(addr, value); | 528 | return ec_write(addr, value); |
| 529 | #endif | 529 | #endif |
| @@ -539,7 +539,7 @@ static int sonypi_ec_write(u8 addr, u8 value) | |||
| 539 | 539 | ||
| 540 | static int sonypi_ec_read(u8 addr, u8 *value) | 540 | static int sonypi_ec_read(u8 addr, u8 *value) |
| 541 | { | 541 | { |
| 542 | #ifdef CONFIG_ACPI_EC | 542 | #ifdef CONFIG_ACPI |
| 543 | if (SONYPI_ACPI_ACTIVE) | 543 | if (SONYPI_ACPI_ACTIVE) |
| 544 | return ec_read(addr, value); | 544 | return ec_read(addr, value); |
| 545 | #endif | 545 | #endif |