diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
| commit | 4542437679de448de0f75bc901dab380d6a5bc5b (patch) | |
| tree | 1a436c9b6f9459c3938e2bb1ab7ad2c888d0003c /drivers/pci/setup-bus.c | |
| parent | 2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge in v2.6.14 by hand
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 @@ | |||
| 40 | * FIXME: IO should be max 256 bytes. However, since we may | 40 | * FIXME: IO should be max 256 bytes. However, since we may |
| 41 | * have a P2P bridge below a cardbus bridge, we need 4K. | 41 | * have a P2P bridge below a cardbus bridge, we need 4K. |
| 42 | */ | 42 | */ |
| 43 | #define CARDBUS_IO_SIZE (4*1024) | 43 | #define CARDBUS_IO_SIZE (256) |
| 44 | #define CARDBUS_MEM_SIZE (32*1024*1024) | 44 | #define CARDBUS_MEM_SIZE (32*1024*1024) |
| 45 | 45 | ||
| 46 | static void __devinit | 46 | static void __devinit |