summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-07-13 16:21:05 -0700
committerMatt Turner <mattst88@gmail.com>2013-07-19 13:54:25 -0700
commite40600997249844933293859c2effa8b7468c97a (patch)
tree1c058201546cacc73e44de0245ba48011d8d6e64 /arch/alpha/kernel
parent231b0bedf55325ee5a1c7bdd47d00131dafc9ab7 (diff)
downloadlinux-e40600997249844933293859c2effa8b7468c97a.tar.bz2
alpha: Fix type compatibility warning for marvel_map_irq
Acked-by: Phil Carmody <pc+lkml@asdf.org> Reviewed-and-Tested-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r--arch/alpha/kernel/sys_marvel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 407accc80877..c92e389ff219 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -317,8 +317,9 @@ marvel_init_irq(void)
}
static int
-marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+marvel_map_irq(const struct pci_dev *cdev, u8 slot, u8 pin)
{
+ struct pci_dev *dev = (struct pci_dev *)cdev;
struct pci_controller *hose = dev->sysdata;
struct io7_port *io7_port = hose->sysdata;
struct io7 *io7 = io7_port->io7;