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/arm/mach-ixp2000/ixdp2400.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/arm/mach-ixp2000/ixdp2400.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index dfffc1e817fa..5bad1a8419b7 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
| @@ -78,7 +78,8 @@ int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys) | |||
| 78 | return 1; | 78 | return 1; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static int __init ixdp2400_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 81 | static int __init ixdp2400_pci_map_irq(const struct pci_dev *dev, u8 slot, |
| 82 | u8 pin) | ||
| 82 | { | 83 | { |
| 83 | if (ixdp2x00_master_npu()) { | 84 | if (ixdp2x00_master_npu()) { |
| 84 | 85 | ||