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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
ixdp2400.c
diff --git
a/arch/arm/mach-ixp2000/ixdp2400.c
b/arch/arm/mach-ixp2000/ixdp2400.c
index
dfffc1e
..
5bad1a8
100644
(file)
--- a/
arch/arm/mach-ixp2000/ixdp2400.c
+++ b/
arch/arm/mach-ixp2000/ixdp2400.c
@@
-78,7
+78,8
@@
int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys)
return 1;
}
-static int __init ixdp2400_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init ixdp2400_pci_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
if (ixdp2x00_master_npu()) {