aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/cobalt/pci.c
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
commitada47b5fe13d89735805b566185f4885f5a3f750 (patch)
tree644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/cobalt/pci.c
parent43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff)
parent3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff)
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/cobalt/pci.c')
-rw-r--r--arch/mips/cobalt/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cobalt/pci.c b/arch/mips/cobalt/pci.c
index cfce7af1bca9..85ec9cc31d66 100644
--- a/arch/mips/cobalt/pci.c
+++ b/arch/mips/cobalt/pci.c
@@ -25,7 +25,7 @@ static struct resource cobalt_mem_resource = {
25 25
26static struct resource cobalt_io_resource = { 26static struct resource cobalt_io_resource = {
27 .start = 0x1000, 27 .start = 0x1000,
28 .end = GT_DEF_PCI0_IO_SIZE - 1, 28 .end = 0xffffffUL,
29 .name = "PCI I/O", 29 .name = "PCI I/O",
30 .flags = IORESOURCE_IO, 30 .flags = IORESOURCE_IO,
31}; 31};