diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 17:10:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 17:10:24 -0700 |
| commit | 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1 (patch) | |
| tree | bf3cd405213c37f1ed363c3b2f542088e05ea571 /arch/x86/include | |
| parent | 7d02093e29de9efc4a72d5e93baae9506969b789 (diff) | |
| parent | fec84e330719c20d2146c8dbdc9ff50b3a1d7039 (diff) | |
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk
x86, hpet: Restrict read back to affected ATI chipsets
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/hpet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h index 1d5c08a1bdf..004e6e25e91 100644 --- a/arch/x86/include/asm/hpet.h +++ b/arch/x86/include/asm/hpet.h @@ -68,6 +68,7 @@ extern unsigned long force_hpet_address; extern u8 hpet_blockid; extern int hpet_force_user; extern u8 hpet_msi_disable; +extern u8 hpet_readback_cmp; extern int is_hpet_enabled(void); extern int hpet_enable(void); extern void hpet_disable(void); |