aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-05-29 04:40:39 -0400
committerLen Brown <len.brown@intel.com>2011-05-29 04:40:39 -0400
commit751516f0a9bad32544f40f471037c0e45fb639c9 (patch)
tree8bdd745909a1523f720ae978c12b9c686d58baaa /include
parent6288cf1e768ae73db5ddaaae54d85245cc1c2b56 (diff)
parent08b53f0e6b565fe8dc0b8f929960ed16d76291bd (diff)
Merge branch 'ec-cleanup' into release
Conflicts: drivers/platform/x86/compal-laptop.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a2e910e01293..1deb2a73c2da 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -150,8 +150,7 @@ extern int ec_read(u8 addr, u8 *val);
150extern int ec_write(u8 addr, u8 val); 150extern int ec_write(u8 addr, u8 val);
151extern int ec_transaction(u8 command, 151extern int ec_transaction(u8 command,
152 const u8 *wdata, unsigned wdata_len, 152 const u8 *wdata, unsigned wdata_len,
153 u8 *rdata, unsigned rdata_len, 153 u8 *rdata, unsigned rdata_len);
154 int force_poll);
155 154
156#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE) 155#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
157 156