diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:17:52 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:17:52 +0200 |
commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /drivers/pci/setup-bus.c | |
parent | [PATCH] sky2: add permanent address support. (diff) | |
parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
download | linux-90890687859ea658759e653c4e70ed7e9e1a6217.tar.xz linux-90890687859ea658759e653c4e70ed7e9e1a6217.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 657be948baf7..28ce3a7ee434 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -40,7 +40,7 @@ * FIXME: IO should be max 256 bytes. However, since we may * have a P2P bridge below a cardbus bridge, we need 4K. */ -#define CARDBUS_IO_SIZE (4*1024) +#define CARDBUS_IO_SIZE (256) #define CARDBUS_MEM_SIZE (32*1024*1024) static void __devinit |