diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
| commit | 33a8c927e423a205bcbbecdc43b451bad781a08e (patch) | |
| tree | 4ed692143eec382ba87872cc48e7162e06bd7465 /drivers/acpi/ec.c | |
| parent | b8ef914e58e90c3b4dba5f5bdd8ab04c45d3e008 (diff) | |
| parent | 8a383ef0be01e0e6e84c85f8bf35e4e6fcfb8981 (diff) | |
Merge branch 'fluff' into release
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 2e8317bf723e..8dfcbb8aff73 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -369,7 +369,7 @@ unlock: | |||
| 369 | * Note: samsung nv5000 doesn't work with ec burst mode. | 369 | * Note: samsung nv5000 doesn't work with ec burst mode. |
| 370 | * http://bugzilla.kernel.org/show_bug.cgi?id=4980 | 370 | * http://bugzilla.kernel.org/show_bug.cgi?id=4980 |
| 371 | */ | 371 | */ |
| 372 | int acpi_ec_burst_enable(struct acpi_ec *ec) | 372 | static int acpi_ec_burst_enable(struct acpi_ec *ec) |
| 373 | { | 373 | { |
| 374 | u8 d; | 374 | u8 d; |
| 375 | struct transaction t = {.command = ACPI_EC_BURST_ENABLE, | 375 | struct transaction t = {.command = ACPI_EC_BURST_ENABLE, |
| @@ -379,7 +379,7 @@ int acpi_ec_burst_enable(struct acpi_ec *ec) | |||
| 379 | return acpi_ec_transaction(ec, &t, 0); | 379 | return acpi_ec_transaction(ec, &t, 0); |
| 380 | } | 380 | } |
| 381 | 381 | ||
| 382 | int acpi_ec_burst_disable(struct acpi_ec *ec) | 382 | static int acpi_ec_burst_disable(struct acpi_ec *ec) |
| 383 | { | 383 | { |
| 384 | struct transaction t = {.command = ACPI_EC_BURST_DISABLE, | 384 | struct transaction t = {.command = ACPI_EC_BURST_DISABLE, |
| 385 | .wdata = NULL, .rdata = NULL, | 385 | .wdata = NULL, .rdata = NULL, |