git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
pci.c
diff --git
a/arch/parisc/kernel/pci.c
b/arch/parisc/kernel/pci.c
index
79c7db2
..
d3b8fc5
100644
(file)
--- a/
arch/parisc/kernel/pci.c
+++ b/
arch/parisc/kernel/pci.c
@@
-9,7
+9,6
@@
* Copyright (C) 1999-2001 Hewlett-Packard Company
* Copyright (C) 1999-2001 Grant Grundler
*/
* Copyright (C) 1999-2001 Hewlett-Packard Company
* Copyright (C) 1999-2001 Grant Grundler
*/
-#include <linux/config.h>
#include <linux/eisa.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/eisa.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-289,7
+288,7
@@
EXPORT_SYMBOL(pcibios_bus_to_resource);
* than res->start.
*/
void pcibios_align_resource(void *data, struct resource *res,
* than res->start.
*/
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
alignment)
+
resource_size_t size, resource_size_t
alignment)
{
unsigned long mask, align;
{
unsigned long mask, align;