summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp23xx
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-12-06 23:11:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-07 17:16:19 +0100
commit46156e04def20749c46efd8fc40e3527eae97b49 (patch)
treeb978b96b3378ec09cb174246b5b555c57ce31028 /arch/arm/mach-ixp23xx
parent[ARM] 3982/2: Explicitly select 32-bit ARM ISA (-marm) (diff)
downloadlinux-46156e04def20749c46efd8fc40e3527eae97b49.tar.xz
linux-46156e04def20749c46efd8fc40e3527eae97b49.zip
[ARM] 3994/1: ixp23xx: fix handling of pci master aborts
The PCI master abort handling issue that affected ixp2000 also affects ixp23xx. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp23xx')
-rw-r--r--arch/arm/mach-ixp23xx/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c
index 3b34fa35e36b..ac7d43d23c28 100644
--- a/arch/arm/mach-ixp23xx/pci.c
+++ b/arch/arm/mach-ixp23xx/pci.c
@@ -36,7 +36,7 @@
extern int (*external_fault) (unsigned long, struct pt_regs *);
-static int pci_master_aborts = 0;
+static volatile int pci_master_aborts = 0;
#ifdef DEBUG
#define DBG(x...) printk(x)