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 branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mv78xx0
/
pcie.c
diff --git
a/arch/arm/mach-mv78xx0/pcie.c
b/arch/arm/mach-mv78xx0/pcie.c
index
d6336af
..
c51af1c
100644
(file)
--- a/
arch/arm/mach-mv78xx0/pcie.c
+++ b/
arch/arm/mach-mv78xx0/pcie.c
@@
-260,7
+260,8
@@
mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)
return bus;
}
-static int __init mv78xx0_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
struct pcie_port *pp = bus_to_port(dev->bus->number);