diff options
Diffstat (limited to 'arch/x86/kernel/quirks.c')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 309949e9e1c1..e95022e4f5d5 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -74,8 +74,7 @@ static void ich_force_hpet_resume(void) | |||
| 74 | if (!force_hpet_address) | 74 | if (!force_hpet_address) |
| 75 | return; | 75 | return; |
| 76 | 76 | ||
| 77 | if (rcba_base == NULL) | 77 | BUG_ON(rcba_base == NULL); |
| 78 | BUG(); | ||
| 79 | 78 | ||
| 80 | /* read the Function Disable register, dword mode only */ | 79 | /* read the Function Disable register, dword mode only */ |
| 81 | val = readl(rcba_base + 0x3404); | 80 | val = readl(rcba_base + 0x3404); |
| @@ -172,7 +171,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4, | |||
| 172 | ich_force_enable_hpet); | 171 | ich_force_enable_hpet); |
| 173 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, | 172 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, |
| 174 | ich_force_enable_hpet); | 173 | ich_force_enable_hpet); |
| 175 | 174 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x3a16, /* ICH10 */ | |
| 175 | ich_force_enable_hpet); | ||
| 176 | 176 | ||
| 177 | static struct pci_dev *cached_dev; | 177 | static struct pci_dev *cached_dev; |
| 178 | 178 | ||