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 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
glantank.c
diff --git
a/arch/arm/mach-iop32x/glantank.c
b/arch/arm/mach-iop32x/glantank.c
index
c6b6f9c
..
ceef5d4
100644
(file)
--- a/
arch/arm/mach-iop32x/glantank.c
+++ b/
arch/arm/mach-iop32x/glantank.c
@@
-77,7
+77,7
@@
void __init glantank_map_io(void)
#define INTD IRQ_IOP32X_XINT3
static int __init
-glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+glantank_pci_map_irq(
const
struct pci_dev *dev, u8 slot, u8 pin)
{
static int pci_irq_table[][4] = {
/*