diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
| commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
| tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /arch/x86/kernel/quirks.c | |
| parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
| parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) | |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'arch/x86/kernel/quirks.c')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 18093d7498f0..12e9feaa2f7a 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -491,6 +491,19 @@ void force_hpet_resume(void) | |||
| 491 | break; | 491 | break; |
| 492 | } | 492 | } |
| 493 | } | 493 | } |
| 494 | |||
| 495 | /* | ||
| 496 | * HPET MSI on some boards (ATI SB700/SB800) has side effect on | ||
| 497 | * floppy DMA. Disable HPET MSI on such platforms. | ||
| 498 | */ | ||
| 499 | static void force_disable_hpet_msi(struct pci_dev *unused) | ||
| 500 | { | ||
| 501 | hpet_msi_disable = 1; | ||
| 502 | } | ||
| 503 | |||
| 504 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, | ||
| 505 | force_disable_hpet_msi); | ||
| 506 | |||
| 494 | #endif | 507 | #endif |
| 495 | 508 | ||
| 496 | #if defined(CONFIG_PCI) && defined(CONFIG_NUMA) | 509 | #if defined(CONFIG_PCI) && defined(CONFIG_NUMA) |