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-ixp4xx
/
gateway7001-pci.c
diff --git
a/arch/arm/mach-ixp4xx/gateway7001-pci.c
b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index
7e93a09
..
76581fb
100644
(file)
--- a/
arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/
arch/arm/mach-ixp4xx/gateway7001-pci.c
@@
-29,13
+29,14
@@
void __init gateway7001_pci_preinit(void)
{
void __init gateway7001_pci_preinit(void)
{
- set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
- set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
+
irq_
set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
+
irq_
set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
ixp4xx_pci_preinit();
}
ixp4xx_pci_preinit();
}
-static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot,
+ u8 pin)
{
if (slot == 1)
return IRQ_IXP4XX_GPIO11;
{
if (slot == 1)
return IRQ_IXP4XX_GPIO11;