diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:58 +0100 |
| commit | e2f4699ac15fe36de1288505bc6e6e5a8603ab1b (patch) | |
| tree | 8078d3ff21eaa0a0ed6e446ac94f3681e831cad1 /arch/mips/cobalt/pci.c | |
| parent | 1883c79a57a5fe25309007590cccb1b2782c41b2 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| download | op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.zip op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.tar.gz | |
Merge branch 'linus' into core/rcu
Merge reason: Backmerge latest upstream to queue up dependent fix in the
scheduler.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/cobalt/pci.c')
| -rw-r--r-- | arch/mips/cobalt/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cobalt/pci.c b/arch/mips/cobalt/pci.c index cfce7af..85ec9cc 100644 --- a/arch/mips/cobalt/pci.c +++ b/arch/mips/cobalt/pci.c @@ -25,7 +25,7 @@ static struct resource cobalt_mem_resource = { static struct resource cobalt_io_resource = { .start = 0x1000, - .end = GT_DEF_PCI0_IO_SIZE - 1, + .end = 0xffffffUL, .name = "PCI I/O", .flags = IORESOURCE_IO, }; |
