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/brodo/pcmcia-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
wnr854t-setup.c
diff --git
a/arch/arm/mach-orion5x/wnr854t-setup.c
b/arch/arm/mach-orion5x/wnr854t-setup.c
index
444a1c7
..
2653595
100644
(file)
--- a/
arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/
arch/arm/mach-orion5x/wnr854t-setup.c
@@
-133,7
+133,8
@@
static void __init wnr854t_init(void)
platform_device_register(&wnr854t_nor_flash);
}
-static int __init wnr854t_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init wnr854t_pci_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
int irq;