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-ixp2000
/
enp2611.c
diff --git
a/arch/arm/mach-ixp2000/enp2611.c
b/arch/arm/mach-ixp2000/enp2611.c
index
88663ab
..
62c60ad
100644
(file)
--- a/
arch/arm/mach-ixp2000/enp2611.c
+++ b/
arch/arm/mach-ixp2000/enp2611.c
@@
-148,7
+148,8
@@
static struct pci_bus * __init enp2611_pci_scan_bus(int nr,
return pci_scan_bus(sys->busnr, &enp2611_pci_ops, sys);
}
-static int __init enp2611_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init enp2611_pci_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
int irq;