diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/sh/drivers/pci/fixups-cayman.c | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/sh/drivers/pci/fixups-cayman.c')
| -rw-r--r-- | arch/sh/drivers/pci/fixups-cayman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/fixups-cayman.c b/arch/sh/drivers/pci/fixups-cayman.c index b68b61d22c6c..edc2fb7a5bb2 100644 --- a/arch/sh/drivers/pci/fixups-cayman.c +++ b/arch/sh/drivers/pci/fixups-cayman.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <cpu/irq.h> | 5 | #include <cpu/irq.h> |
| 6 | #include "pci-sh5.h" | 6 | #include "pci-sh5.h" |
| 7 | 7 | ||
| 8 | int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin) | 8 | int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
| 9 | { | 9 | { |
| 10 | int result = -1; | 10 | int result = -1; |
| 11 | 11 | ||