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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
pci
/
pci.c
diff --git
a/arch/mips/pci/pci.c
b/arch/mips/pci/pci.c
index
21402ff
..
5ace368
100644
(file)
--- a/
arch/mips/pci/pci.c
+++ b/
arch/mips/pci/pci.c
@@
-6,7
+6,6
@@
*
* Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)
*/
*
* Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
@@
-51,11
+50,11
@@
unsigned long PCIBIOS_MIN_MEM = 0;
*/
void
pcibios_align_resource(void *data, struct resource *res,
*/
void
pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
struct pci_dev *dev = data;
struct pci_controller *hose = dev->sysdata;
{
struct pci_dev *dev = data;
struct pci_controller *hose = dev->sysdata;
-
unsigned long
start = res->start;
+
resource_size_t
start = res->start;
if (res->flags & IORESOURCE_IO) {
/* Make sure we start at our min on all hoses */
if (res->flags & IORESOURCE_IO) {
/* Make sure we start at our min on all hoses */
@@
-76,11
+75,6
@@
pcibios_align_resource(void *data, struct resource *res,
res->start = start;
}
res->start = start;
}
-struct pci_controller * __init alloc_pci_controller(void)
-{
- return alloc_bootmem(sizeof(struct pci_controller));
-}
-
void __init register_pci_controller(struct pci_controller *hose)
{
*hose_tail = hose;
void __init register_pci_controller(struct pci_controller *hose)
{
*hose_tail = hose;