summaryrefslogtreecommitdiffstats
path: root/drivers/char/sonypi.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-11-11 21:14:11 -0500
committerLen Brown <len.brown@intel.com>2008-11-11 21:14:11 -0500
commit3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch)
treebe2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/char/sonypi.c
parente911d27af43e7d28d59a96a4682e8942f0661469 (diff)
parent32836259ff25ce97010569706cd33ba94de81d62 (diff)
downloadop-kernel-dev-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.zip
op-kernel-dev-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.tar.gz
Merge branch 'misc' into release
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r--drivers/char/sonypi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 2457b07..f437443 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
OpenPOWER on IntegriCloud