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 git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx-pci.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx-pci.c
b/arch/arm/mach-pxa/cm-x2xx-pci.c
index
4eb7660
..
6bf479d
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/
arch/arm/mach-pxa/cm-x2xx-pci.c
@@
-77,7
+77,7
@@
void cmx2xx_pci_resume(void) {}
#endif
/* PCI IRQ mapping*/
-static int __init cmx2xx_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init cmx2xx_pci_map_irq(
const
struct pci_dev *dev, u8 slot, u8 pin)
{
int irq;