diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-23 01:38:39 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-23 01:38:39 +0200 |
| commit | 7a04c4cbf73953f1995a141534b7fe0c35828057 (patch) | |
| tree | 8b83a813600605510bd54cadb81f296d342e1b6b /arch/arm/mach-orion5x/dns323-setup.c | |
| parent | ARM: OMAP2+: Fix missing inline functions for Makefile cleanup (diff) | |
| parent | ARM: 7082/1: platform_device: pdev_archdata: add omap_device pointer (diff) | |
| download | linux-7a04c4cbf73953f1995a141534b7fe0c35828057.tar.xz linux-7a04c4cbf73953f1995a141534b7fe0c35828057.zip | |
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/arm/mach-orion5x/dns323-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index a6eddae82a0b..c105556a0ee1 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c @@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) /* * Check for devices with hard-wired IRQs. */ - irq = orion5x_pci_map_irq(const dev, slot, pin); + irq = orion5x_pci_map_irq(dev, slot, pin); if (irq != -1) return irq; |