diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /arch/arm/mach-orion5x/dns323-setup.c | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff) | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff) | |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.
Conflicts:
drivers/base/power/clock_ops.c
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) | |||
| 77 | /* | 77 | /* |
| 78 | * Check for devices with hard-wired IRQs. | 78 | * Check for devices with hard-wired IRQs. |
| 79 | */ | 79 | */ |
| 80 | irq = orion5x_pci_map_irq(const dev, slot, pin); | 80 | irq = orion5x_pci_map_irq(dev, slot, pin); |
| 81 | if (irq != -1) | 81 | if (irq != -1) |
| 82 | return irq; | 82 | return irq; |
| 83 | 83 | ||