git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
mpic.h
diff --git
a/arch/powerpc/include/asm/mpic.h
b/arch/powerpc/include/asm/mpic.h
index a002682f3a6dfe4b2dfe4e2ac88b6f935839b137..61913d9a21a025b5b1269ec2d797ed8229f50c74 100644
(file)
--- a/
arch/powerpc/include/asm/mpic.h
+++ b/
arch/powerpc/include/asm/mpic.h
@@
-289,7
+289,7
@@
struct mpic
#ifdef CONFIG_MPIC_U3_HT_IRQS
/* The fixup table */
struct mpic_irq_fixup *fixups;
-
spinlock_t
fixup_lock;
+
raw_spinlock_t
fixup_lock;
#endif
/* Register access method */