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 'egalax' into for-linus
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
cpudata_64.h
diff --git
a/arch/sparc/include/asm/cpudata_64.h
b/arch/sparc/include/asm/cpudata_64.h
index
926397d
..
050ef35
100644
(file)
--- a/
arch/sparc/include/asm/cpudata_64.h
+++ b/
arch/sparc/include/asm/cpudata_64.h
@@
-17,7
+17,7
@@
typedef struct {
unsigned int __nmi_count;
unsigned long clock_tick; /* %tick's per second */
unsigned long __pad;
- unsigned int
__pad1
;
+ unsigned int
irq0_irqs
;
unsigned int __pad2;
/* Dcache line 2, rarely used */