summaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/pci/fixups-sh03.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-08 08:22:41 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-08 08:22:41 +0200
commit1a43f2012455a977397deffe35912fd3f3ce17b9 (patch)
tree5189f337df44e7a495fbd097cd476b0380babd8c /arch/sh/drivers/pci/fixups-sh03.c
parentARM: iMX5: Don't enable DPLL if it already enabled (diff)
parentLinux 3.1-rc1 (diff)
downloadlinux-1a43f2012455a977397deffe35912fd3f3ce17b9.tar.xz
linux-1a43f2012455a977397deffe35912fd3f3ce17b9.zip
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/sh/drivers/pci/fixups-sh03.c')
-rw-r--r--arch/sh/drivers/pci/fixups-sh03.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/fixups-sh03.c b/arch/sh/drivers/pci/fixups-sh03.c
index 2e8a18b7ee53..1615e5906168 100644
--- a/arch/sh/drivers/pci/fixups-sh03.c
+++ b/arch/sh/drivers/pci/fixups-sh03.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/pci.h>
-int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
int irq;