diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 19:23:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 19:23:03 -0400 |
| commit | 236e946b53ffd5e2f5d7e6abebbe72a9f0826d15 (patch) | |
| tree | b50c372fd90fe736f7d29aab15fbb3b13780acd8 /arch/x86/include/asm/pci_x86.h | |
| parent | f27884aeadff9654f4a1e8a05dd92f4b140afe29 (diff) | |
Revert "PCI: use ACPI _CRS data by default"
This reverts commit 9e9f46c44e487af0a82eb61b624553e2f7118f5b.
Quoting from the commit message:
"At this point, it seems to solve more problems than it causes, so let's
try using it by default. It's an easy revert if it ends up causing
trouble."
And guess what? The _CRS code causes trouble.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/pci_x86.h')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index d419f5c0266..b399988eee3 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #define PCI_BIOS_IRQ_SCAN 0x2000 | 25 | #define PCI_BIOS_IRQ_SCAN 0x2000 |
| 26 | #define PCI_ASSIGN_ALL_BUSSES 0x4000 | 26 | #define PCI_ASSIGN_ALL_BUSSES 0x4000 |
| 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 | 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 |
| 28 | #define PCI_NO_ROOT_CRS 0x10000 | 28 | #define PCI_USE__CRS 0x10000 |
| 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 | 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 |
| 30 | #define PCI_HAS_IO_ECS 0x40000 | 30 | #define PCI_HAS_IO_ECS 0x40000 |
| 31 | #define PCI_NOASSIGN_ROMS 0x80000 | 31 | #define PCI_NOASSIGN_ROMS 0x80000 |