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
/
au1000
/
common
/
pci.c
diff --git
a/arch/mips/au1000/common/pci.c
b/arch/mips/au1000/common/pci.c
index
4e5a6e1
..
9f8ce08
100644
(file)
--- a/
arch/mips/au1000/common/pci.c
+++ b/
arch/mips/au1000/common/pci.c
@@
-30,7
+30,6
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
@@
-40,17
+39,17
@@
/* TBD */
static struct resource pci_io_resource = {
/* TBD */
static struct resource pci_io_resource = {
-
"pci IO space"
,
-
(u32)PCI_IO_START
,
-
(u32)PCI_IO_END
,
- IORESOURCE_IO
+
.start = (resource_size_t)PCI_IO_START
,
+
.end = (resource_size_t)PCI_IO_END
,
+
.name = "PCI IO space"
,
+
.flags =
IORESOURCE_IO
};
static struct resource pci_mem_resource = {
};
static struct resource pci_mem_resource = {
-
"pci memory space"
,
-
(u32)PCI_MEM_START
,
-
(u32)PCI_MEM_END
,
- IORESOURCE_MEM
+
.start = (resource_size_t)PCI_MEM_START
,
+
.end = (resource_size_t)PCI_MEM_END
,
+
.name = "PCI memory space"
,
+
.flags =
IORESOURCE_MEM
};
extern struct pci_ops au1x_pci_ops;
};
extern struct pci_ops au1x_pci_ops;