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 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
pci.c
diff --git
a/arch/arm/mach-ixp2000/pci.c
b/arch/arm/mach-ixp2000/pci.c
index
d4bf1e1
..
5a09a90
100644
(file)
--- a/
arch/arm/mach-ixp2000/pci.c
+++ b/
arch/arm/mach-ixp2000/pci.c
@@
-32,7
+32,7
@@
#include <asm/mach/pci.h>
-static int pci_master_aborts = 0;
+static
volatile
int pci_master_aborts = 0;
static int clear_master_aborts(void);