diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:21 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:21 -0400 |
| commit | d3b683d3b0e260938b9ed568f76a00991d5c692b (patch) | |
| tree | 8dbeb987c94df052902eeb871251eb9b3591e3f4 /drivers | |
| parent | 6e04c417aed5b0a5bd6ae80928bbd759fa1faabc (diff) | |
| parent | eaeca2e9a7dbd8f05a8a47e66e3e1de105426f0b (diff) | |
Merge branch 'cleanup' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f4428e82b352..175c89a5ca90 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | #define ACPI_PROCESSOR_CLASS "processor" | 64 | #define ACPI_PROCESSOR_CLASS "processor" |
| 65 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 65 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
| 66 | ACPI_MODULE_NAME("processor_idle"); | 66 | ACPI_MODULE_NAME("processor_idle"); |
| 67 | #define ACPI_PROCESSOR_FILE_POWER "power" | ||
| 68 | #define PM_TIMER_TICK_NS (1000000000ULL/PM_TIMER_FREQUENCY) | 67 | #define PM_TIMER_TICK_NS (1000000000ULL/PM_TIMER_FREQUENCY) |
| 69 | #define C2_OVERHEAD 1 /* 1us */ | 68 | #define C2_OVERHEAD 1 /* 1us */ |
| 70 | #define C3_OVERHEAD 1 /* 1us */ | 69 | #define C3_OVERHEAD 1 /* 1us */ |