diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
| commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
| tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /drivers/acpi/ec.c | |
| parent | 25c68a33b7b74b37793b1250007e5e21d621a7fc (diff) | |
| parent | 7d63c6759188b9b35c789159f6e02cd02d49ec7d (diff) | |
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) | |||
| 367 | 367 | ||
| 368 | EXPORT_SYMBOL(ec_write); | 368 | EXPORT_SYMBOL(ec_write); |
| 369 | 369 | ||
| 370 | extern int ec_transaction(u8 command, | 370 | int ec_transaction(u8 command, |
| 371 | const u8 * wdata, unsigned wdata_len, | 371 | const u8 * wdata, unsigned wdata_len, |
| 372 | u8 * rdata, unsigned rdata_len) | 372 | u8 * rdata, unsigned rdata_len) |
| 373 | { | 373 | { |