git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
pci
/
ops-it8172.c
diff --git
a/arch/mips/pci/ops-it8172.c
b/arch/mips/pci/ops-it8172.c
index
2f40a8c
..
ba83285
100644
(file)
--- a/
arch/mips/pci/ops-it8172.c
+++ b/
arch/mips/pci/ops-it8172.c
@@
-7,6
+7,8
@@
* Author: MontaVista Software, Inc.
* ppopov@mvista.com or source@mvista.com
*
* Author: MontaVista Software, Inc.
* ppopov@mvista.com or source@mvista.com
*
+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
@@
-32,7
+34,6
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/pci_channel.h>
#include <asm/it8172/it8172.h>
#include <asm/it8172/it8172_pci.h>
#include <asm/it8172/it8172.h>
#include <asm/it8172/it8172_pci.h>
@@
-49,30
+50,28
@@
static struct resource pci_mem_resource_1;
static struct resource pci_io_resource = {
static struct resource pci_mem_resource_1;
static struct resource pci_io_resource = {
-
"io pci IO space"
,
-
0x14018000
,
-
0x17FFFFFF
,
- IORESOURCE_IO
+
.start = 0x14018000
,
+
.end = 0x17FFFFFF
,
+
.name = "io pci IO space"
,
+
.flags =
IORESOURCE_IO
};
static struct resource pci_mem_resource_0 = {
};
static struct resource pci_mem_resource_0 = {
-
"ext pci memory space 0/1"
,
-
0x10101000
,
-
0x13FFFFFF
,
- IORESOURCE_MEM,
- &pci_mem_resource_0,
- NULL,
- &pci_mem_resource_1
+
.start = 0x10101000
,
+
.end = 0x13FFFFFF
,
+
.name = "ext pci memory space 0/1"
,
+
.flags =
IORESOURCE_MEM,
+
.parent =
&pci_mem_resource_0,
+
.sibling =
NULL,
+
.child =
&pci_mem_resource_1
};
static struct resource pci_mem_resource_1 = {
};
static struct resource pci_mem_resource_1 = {
- "ext pci memory space 2/3",
- 0x1A000000,
- 0x1FBFFFFF,
- IORESOURCE_MEM,
- &pci_mem_resource_0,
- NULL,
- NULL
+ .start = 0x1A000000,
+ .end = 0x1FBFFFFF,
+ .name = "ext pci memory space 2/3",
+ .flags = IORESOURCE_MEM,
+ .parent = &pci_mem_resource_0
};
extern struct pci_ops it8172_pci_ops;
};
extern struct pci_ops it8172_pci_ops;