diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 04:06:12 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 04:06:12 -0400 |
| commit | f685648e7d6520653fa2641840cccc58ba8ef8e0 (patch) | |
| tree | d93e9106d18cd53a63e5ae94999f53b39e52053e /include | |
| parent | f142051505154da4ba689e129deb06524c5ece8a (diff) | |
| parent | 00eb43a1897a8845d0edb198cec69ac5f1f299dd (diff) | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 8bcfaa4c66ae..fccd8b548d93 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -182,7 +182,8 @@ extern int ec_read(u8 addr, u8 *val); | |||
| 182 | extern int ec_write(u8 addr, u8 val); | 182 | extern int ec_write(u8 addr, u8 val); |
| 183 | extern int ec_transaction(u8 command, | 183 | extern int ec_transaction(u8 command, |
| 184 | const u8 *wdata, unsigned wdata_len, | 184 | const u8 *wdata, unsigned wdata_len, |
| 185 | u8 *rdata, unsigned rdata_len); | 185 | u8 *rdata, unsigned rdata_len, |
| 186 | int force_poll); | ||
| 186 | 187 | ||
| 187 | #endif /*CONFIG_ACPI_EC*/ | 188 | #endif /*CONFIG_ACPI_EC*/ |
| 188 | 189 | ||