Mercurial > hg > aboriginal

comparison sources/patches/linux-arm.patch @ 1598:3cbf1abde44a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to linux 3.9.
author Rob Landley <rob@landley.net>
date Mon, 29 Apr 2013 22:03:14 -0500
parents 96fb8598a446
children c756b708583f
comparison
equal deleted inserted replaced
1597:15b4fc37d5f7 1598:3cbf1abde44a
88 +endif 88 +endif
89 + 89 +
90 config ARCH_VERSATILE_PB 90 config ARCH_VERSATILE_PB
91 bool "Support Versatile Platform Baseboard for ARM926EJ-S" 91 bool "Support Versatile Platform Baseboard for ARM926EJ-S"
92 default y 92 default y
93 diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c 93 diff -ruN linux/arch/arm/mach-versatile/pci.c linux.bak/arch/arm/mach-versatile/pci.c
94 index 2f84f40..cd7c8ce 100644 94 --- linux/arch/arm/mach-versatile/pci.c 2013-04-28 19:36:01.000000000 -0500
95 --- a/arch/arm/mach-versatile/pci.c 95 +++ linux.bak/arch/arm/mach-versatile/pci.c 2013-04-29 19:09:44.857097553 -0500
96 +++ b/arch/arm/mach-versatile/pci.c 96 @@ -333,7 +333,7 @@
97 @@ -332,7 +332,7 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 97 * 26 1 IRQ_SIC_PCI2
98 * 26 1 29 98 * 27 1 IRQ_SIC_PCI3
99 * 27 1 30
100 */ 99 */
101 - irq = 27 + ((slot - 24 + pin - 1) & 3); 100 - irq = IRQ_SIC_PCI0 + ((slot - 24 + pin - 1) & 3);
102 + irq = 59; //27 + ((slot - 24 + pin - 1) & 3); 101 + irq = 59; //IRQ_SIC_PCI0 + ((slot - 24 + pin - 1) & 3);
103 102
104 return irq; 103 return irq;
105 } 104 }