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 'regmap-linus' and 'regmap-interface' into regmap-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
terastation_pro2-setup.c
diff --git
a/arch/arm/mach-orion5x/terastation_pro2-setup.c
b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index
29ce826
..
a34e4fa
100644
(file)
--- a/
arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/
arch/arm/mach-orion5x/terastation_pro2-setup.c
@@
-100,7
+100,7
@@
void __init tsp2_pci_preinit(void)
}
}
}
}
-static int __init tsp2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init tsp2_pci_map_irq(
const
struct pci_dev *dev, u8 slot, u8 pin)
{
int irq;
{
int irq;