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-ixp4xx
/
nas100d-pci.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-pci.c
b/arch/arm/mach-ixp4xx/nas100d-pci.c
index
428d120
..
5434ccf
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-pci.c
@@
-41,7
+41,7
@@
void __init nas100d_pci_preinit(void)
ixp4xx_pci_preinit();
}
ixp4xx_pci_preinit();
}
-static int __init nas100d_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init nas100d_map_irq(
const
struct pci_dev *dev, u8 slot, u8 pin)
{
static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
{ IXP4XX_GPIO_IRQ(INTA), -1, -1 },
{
static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
{ IXP4XX_GPIO_IRQ(INTA), -1, -1 },