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
/
philips
/
pnx8550
/
common
/
pci.c
diff --git
a/arch/mips/philips/pnx8550/common/pci.c
b/arch/mips/philips/pnx8550/common/pci.c
index
baa6905
..
eee4f3d
100644
(file)
--- a/
arch/mips/philips/pnx8550/common/pci.c
+++ b/
arch/mips/philips/pnx8550/common/pci.c
@@
-27,17
+27,17
@@
#include <nand.h>
static struct resource pci_io_resource = {
#include <nand.h>
static struct resource pci_io_resource = {
- "pci IO space",
- (u32)(PNX8550_PCIIO + 0x1000), /* reserve regacy I/O space */
-
(u32)(PNX8550_PCIIO + PNX8550_PCIIO_SIZE)
,
- IORESOURCE_IO
+ .start = PNX8550_PCIIO + 0x1000, /* reserve regacy I/O space */
+ .end = PNX8550_PCIIO + PNX8550_PCIIO_SIZE,
+
.name = "pci IO space"
,
+
.flags =
IORESOURCE_IO
};
static struct resource pci_mem_resource = {
};
static struct resource pci_mem_resource = {
-
"pci memory space"
,
-
(u32)(PNX8550_PCIMEM)
,
-
(u32)(PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1)
,
- IORESOURCE_MEM
+
.start = PNX8550_PCIMEM
,
+
.end = PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1
,
+
.name = "pci memory space"
,
+
.flags =
IORESOURCE_MEM
};
extern struct pci_ops pnx8550_pci_ops;
};
extern struct pci_ops pnx8550_pci_ops;