diff --git a/[refs] b/[refs] index 870529aaf5e2..37ef6b9c5f4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7980cbbb30bf044e6f40912a3f6456204ddfc27e +refs/heads/master: 89d7cbf73e1a85241eb42339f6cb7a429fec178c diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 0969d570f3b5..21afa69a086d 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -308,7 +308,7 @@ config HPET_TIMER present. The HPET provides a stable time base on SMP systems, unlike the TSC, but it is more expensive to access, as it is off-chip. You can find the HPET spec at - . + . config X86_PM_TIMER bool "PM timer"