aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-10 04:06:12 -0400
committerLen Brown <len.brown@intel.com>2007-05-10 04:06:12 -0400
commitf685648e7d6520653fa2641840cccc58ba8ef8e0 (patch)
treed93e9106d18cd53a63e5ae94999f53b39e52053e /include
parentf142051505154da4ba689e129deb06524c5ece8a (diff)
parent00eb43a1897a8845d0edb198cec69ac5f1f299dd (diff)
Pull misc-for-upstream into release branch
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8bcfaa4c66a..fccd8b548d9 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -182,7 +182,8 @@ extern int ec_read(u8 addr, u8 *val);
extern int ec_write(u8 addr, u8 val);
extern int ec_transaction(u8 command,
const u8 *wdata, unsigned wdata_len,
- u8 *rdata, unsigned rdata_len);
+ u8 *rdata, unsigned rdata_len,
+ int force_poll);
#endif /*CONFIG_ACPI_EC*/