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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
include
/
asm
/
pvr.h
diff --git
a/arch/microblaze/include/asm/pvr.h
b/arch/microblaze/include/asm/pvr.h
index e38abc7714b60bff43f11b2c52e5401cfd3e8db5..9578666e98baff8f3051a694101d07bb0732eb39 100644
(file)
--- a/
arch/microblaze/include/asm/pvr.h
+++ b/
arch/microblaze/include/asm/pvr.h
@@
-16,7
+16,7
@@
#define PVR_MSR_BIT 0x400
struct pvr_s {
- unsigned pvr[1
6
];
+ unsigned pvr[1
2
];
};
/* The following taken from Xilinx's standalone BSP pvr.h */