[PATCH] x86: Fix resume for nVidia and force_hpet

From: Carlos Corbacho <[email protected]>

Actually set force_hpet_resume_type.
---
Whoops, just noticed I forgot to re-add this to the patch before submitting it.

 arch/x86/kernel/quirks.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index cb21bcb..df01a1e 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -344,6 +344,7 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev)
 	printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
 		force_hpet_address);
 	cached_dev = dev;
+	force_hpet_resume_type = NVIDIA_FORCE_HPET_RESUME;
 	return;
 }
 
-- 
1.5.2.2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • Re: [PATCH] x86: Fix resume for nVidia and force_hpet
    • From: Thomas Gleixner <[email protected]>

• References:
  • nVidia HPET force enable - merge requirements? (resend)
    • From: Carlos Corbacho <[email protected]>
  • [PATCH] x86: Force enable HPET for CK804 (nForce 4) chipsets
    • From: Carlos Corbacho <[email protected]>
  • Re: [PATCH] x86: Force enable HPET for CK804 (nForce 4) chipsets
    • From: Thomas Gleixner <[email protected]>

• Prev by Date: Re: [PATCH 1/9] irq-remove: core
• Next by Date: Re: [PATCH] x86: Fix resume for nVidia and force_hpet
• Previous by thread: Re: [PATCH] x86: Force enable HPET for CK804 (nForce 4) chipsets
• Next by thread: Re: [PATCH] x86: Fix resume for nVidia and force_hpet
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]