On Fri, 19 Oct 2007, Carlos Corbacho wrote: > 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; > }
Yep, noticed it when I pushed it into the queue. Fixed it up already. Please be more careful next time. Btw, I'm happy to take a follow up patch for platforms which you can not test and stick them into -mm for a while. Thanks, tglx - 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/