diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
| commit | 09d92002718edf8ef284ec3726247acc83efbbe0 (patch) | |
| tree | 54fe60e08833214565562ce0e9cefa21c92f95e3 /include/asm-i386/pci.h | |
| parent | cb220c1af49644786944c549518b491d4c654030 (diff) | |
| parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) | |
| download | linux-09d92002718edf8ef284ec3726247acc83efbbe0.tar.gz linux-09d92002718edf8ef284ec3726247acc83efbbe0.tar.xz | |
Merge from-linus to-akpm
Diffstat (limited to 'include/asm-i386/pci.h')
| -rw-r--r-- | include/asm-i386/pci.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 2cbab30734d6..78c85985aee3 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h @@ -18,9 +18,11 @@ extern unsigned int pcibios_assign_all_busses(void); #define pcibios_scan_all_fns(a, b) 0 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); |