summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/pci.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 17:51:35 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 17:51:35 +0200
commitc973b112c76c9d8fd042991128f218a738cc8d0a (patch)
treee813b0da5d0a0e19e06de6462d145a29ad683026 /include/asm-i386/pci.h
parentMerge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
parent[PATCH] fsnotify-cleanups (diff)
downloadlinux-c973b112c76c9d8fd042991128f218a738cc8d0a.tar.xz
linux-c973b112c76c9d8fd042991128f218a738cc8d0a.zip
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'include/asm-i386/pci.h')
-rw-r--r--include/asm-i386/pci.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 78c85985aee3..2cbab30734d6 100644
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -18,11 +18,9 @@ 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 0x1000
+#define PCIBIOS_MIN_IO 0x4000
#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);