diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/ec.c | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 391f331674c7..5180f0f1dd02 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" | 47 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" |
| 48 | #define ACPI_EC_FILE_INFO "info" | 48 | #define ACPI_EC_FILE_INFO "info" |
| 49 | 49 | ||
| 50 | #undef PREFIX | ||
| 51 | #define PREFIX "ACPI: EC: " | 50 | #define PREFIX "ACPI: EC: " |
| 52 | 51 | ||
| 53 | /* EC status register */ | 52 | /* EC status register */ |