1 files changed, 34 insertions, 7 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 4f9ea1210023..928431a9bcb0 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq)
 extern struct pci_ops gt64111_pci_ops;
 static struct resource cobalt_mem_resource = {
-        "PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM
+        .start  = GT64111_MEM_BASE,
+        .end    = GT64111_MEM_END,
+        .name   = "PCI memory",
+        .flags  = IORESOURCE_MEM
 };
 static struct resource cobalt_io_resource = {
-        "PCI I/O", 0x1000, 0xffff, IORESOURCE_IO
+        .start  = 0x1000,
+        .end    = 0xffff,
+        .name   = "PCI I/O",
+        .flags  = IORESOURCE_IO
 };
 static struct resource cobalt_io_resources[] = {
-        { "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
+        {
-        { "timer", 0x40, 0x5f, IORESOURCE_BUSY },
+                .start  = 0x00,
-        { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
+                .end    = 0x1f,
-        { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
+                .name   = "dma1",
-        { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
+                .flags  = IORESOURCE_BUSY
+        }, {
+                .start  = 0x40,
+                .end    = 0x5f,
+                .name   = "timer",
+                .flags  = IORESOURCE_BUSY
+        }, {
+                .start  = 0x60,
+                .end    = 0x6f,
+                .name   = "keyboard",
+                .flags  = IORESOURCE_BUSY
+        }, {
+                .start  = 0x80,
+                .end    = 0x8f,
+                .name   = "dma page reg",
+                .flags  = IORESOURCE_BUSY
+        }, {
+                .start  = 0xc0,
+                .end    = 0xdf,
+                .name   = "dma2",
+                .flags  = IORESOURCE_BUSY
+        },
 };
 #define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))

diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index 4f9ea1210023..928431a9bcb0 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c
@@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq)
68	extern struct pci_ops gt64111_pci_ops;	68	extern struct pci_ops gt64111_pci_ops;
69		69
70	static struct resource cobalt_mem_resource = {	70	static struct resource cobalt_mem_resource = {
71	"PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM	71	.start = GT64111_MEM_BASE,
		72	.end = GT64111_MEM_END,
		73	.name = "PCI memory",
		74	.flags = IORESOURCE_MEM
72	};	75	};
73		76
74	static struct resource cobalt_io_resource = {	77	static struct resource cobalt_io_resource = {
75	"PCI I/O", 0x1000, 0xffff, IORESOURCE_IO	78	.start = 0x1000,
		79	.end = 0xffff,
		80	.name = "PCI I/O",
		81	.flags = IORESOURCE_IO
76	};	82	};
77		83
78	static struct resource cobalt_io_resources[] = {	84	static struct resource cobalt_io_resources[] = {
79	{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },	85	{
80	{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },	86	.start = 0x00,
81	{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },	87	.end = 0x1f,
82	{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },	88	.name = "dma1",
83	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },	89	.flags = IORESOURCE_BUSY
		90	}, {
		91	.start = 0x40,
		92	.end = 0x5f,
		93	.name = "timer",
		94	.flags = IORESOURCE_BUSY
		95	}, {
		96	.start = 0x60,
		97	.end = 0x6f,
		98	.name = "keyboard",
		99	.flags = IORESOURCE_BUSY
		100	}, {
		101	.start = 0x80,
		102	.end = 0x8f,
		103	.name = "dma page reg",
		104	.flags = IORESOURCE_BUSY
		105	}, {
		106	.start = 0xc0,
		107	.end = 0xdf,
		108	.name = "dma2",
		109	.flags = IORESOURCE_BUSY
		110	},
84	};	111	};
85		112
86	#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))	113	#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))