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 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
ts409-setup.c
diff --git
a/arch/arm/mach-orion5x/ts409-setup.c
b/arch/arm/mach-orion5x/ts409-setup.c
index
5aacc7a
..
cc33b22
100644
(file)
--- a/
arch/arm/mach-orion5x/ts409-setup.c
+++ b/
arch/arm/mach-orion5x/ts409-setup.c
@@
-121,7
+121,8
@@
static struct platform_device qnap_ts409_nor_flash = {
* PCI
****************************************************************************/
* PCI
****************************************************************************/
-static int __init qnap_ts409_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init qnap_ts409_pci_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
int irq;
{
int irq;