git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_marvel.c
diff --git
a/arch/alpha/kernel/sys_marvel.c
b/arch/alpha/kernel/sys_marvel.c
index
388b99d
..
95cfc83
100644
(file)
--- a/
arch/alpha/kernel/sys_marvel.c
+++ b/
arch/alpha/kernel/sys_marvel.c
@@
-318,7
+318,7
@@
marvel_init_irq(void)
}
static int
-marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+marvel_map_irq(
const
struct pci_dev *dev, u8 slot, u8 pin)
{
struct pci_controller *hose = dev->sysdata;
struct io7_port *io7_port = hose->sysdata;