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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
mips
/
pci
/
pci-ocelot.c
diff --git
a/arch/mips/pci/pci-ocelot.c
b/arch/mips/pci/pci-ocelot.c
index
3da8a4e
..
2b9495d
100644
(file)
--- a/
arch/mips/pci/pci-ocelot.c
+++ b/
arch/mips/pci/pci-ocelot.c
@@
-71,13
+71,13
@@
static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data)
}
static struct resource ocelot_mem_resource = {
}
static struct resource ocelot_mem_resource = {
-
iomem_resource.start
= GT_PCI_MEM_BASE;
-
iomem_resource.end
= GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;
+
start
= GT_PCI_MEM_BASE;
+
end
= GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;
};
static struct resource ocelot_io_resource = {
};
static struct resource ocelot_io_resource = {
-
ioport_resource.start
= GT_PCI_IO_BASE;
-
ioport_resource.end
= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;
+
start
= GT_PCI_IO_BASE;
+
end
= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;
};
static struct pci_controller ocelot_pci_controller = {
};
static struct pci_controller ocelot_pci_controller = {