diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 06:45:07 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 06:45:07 +0100 |
| commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
| tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /drivers/acpi/ec.c | |
| parent | ACPI: ibm_acpi: respond to workqueue update (diff) | |
| parent | ACPI: ibm-acpi: new ibm-acpi maintainer (diff) | |
| download | linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.xz linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.zip | |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d713f769b72d..4a909bfb805c 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -367,7 +367,7 @@ int ec_write(u8 addr, u8 val) EXPORT_SYMBOL(ec_write); -extern int ec_transaction(u8 command, +int ec_transaction(u8 command, const u8 * wdata, unsigned wdata_len, u8 * rdata, unsigned rdata_len) { |