diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 20:56:20 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 06:40:54 -0400 |
| commit | 592913ecb87a9e06f98ddb55b298f1a66bf94c6b (patch) | |
| tree | 0f63f5535fe517faf418e0f7e69800fcf1e4d8db /drivers/acpi/acpi_pad.c | |
| parent | ce3bf7ab22527183634a76512d9854a38615e4d5 (diff) | |
time: Kill off CONFIG_GENERIC_TIME
Now that all arches have been converted over to use generic time via
clocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME
config option and simplify the generic code.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/acpi/acpi_pad.c')
| -rw-r--r-- | drivers/acpi/acpi_pad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index 446aced33aff..b76848c80be3 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c | |||
| @@ -77,7 +77,7 @@ static void power_saving_mwait_init(void) | |||
| 77 | power_saving_mwait_eax = (highest_cstate << MWAIT_SUBSTATE_SIZE) | | 77 | power_saving_mwait_eax = (highest_cstate << MWAIT_SUBSTATE_SIZE) | |
| 78 | (highest_subcstate - 1); | 78 | (highest_subcstate - 1); |
| 79 | 79 | ||
| 80 | #if defined(CONFIG_GENERIC_TIME) && defined(CONFIG_X86) | 80 | #if defined(CONFIG_X86) |
| 81 | switch (boot_cpu_data.x86_vendor) { | 81 | switch (boot_cpu_data.x86_vendor) { |
| 82 | case X86_VENDOR_AMD: | 82 | case X86_VENDOR_AMD: |
| 83 | case X86_VENDOR_INTEL: | 83 | case X86_VENDOR_INTEL: |