diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/char | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/char')
| -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 |