diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-14 18:21:30 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-14 18:21:30 -0700 |
commit | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (patch) | |
tree | f8a746aca3ca8aeb832d83e9297f2ffe636082c6 /include/asm-x86_64 | |
parent | b4b08e581fac8e0ba9ae348bdc13246c9798c99e (diff) | |
download | linux-3.10-2ba84684e8cf6f980e4e95a2300f53a505eb794e.tar.gz linux-3.10-2ba84684e8cf6f980e4e95a2300f53a505eb794e.tar.bz2 linux-3.10-2ba84684e8cf6f980e4e95a2300f53a505eb794e.zip |
Revert PCIBIOS_MIN_IO changes for 2.6.13
This reverts commits
71db63acff69618b3d9d3114bd061938150e146b
[PATCH] increase PCIBIOS_MIN_IO on x86
and
0b2bfb4e7ff61f286676867c3508569bea6fbf7a
ACPI: increase PCIBIOS_MIN_IO on x86
since Lukas Sandströ<lukass@etek.chalmers.se> reports that this breaks
his on-board nvidia audio.
We should re-visit this later. For now we revert the change
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/pci.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 9c4527eb55e..eeb3088a1c9 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h @@ -22,9 +22,11 @@ extern unsigned int pcibios_assign_all_busses(void); extern int no_iommu, force_iommu; extern unsigned long pci_mem_start; -#define PCIBIOS_MIN_IO 0x4000 +#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM (pci_mem_start) +#define PCIBIOS_MIN_CARDBUS_IO 0x4000 + void pcibios_config_init(void); struct pci_bus * pcibios_scan_root(int bus); extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value); |