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 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
pcr.h
diff --git
a/arch/sparc/include/asm/pcr.h
b/arch/sparc/include/asm/pcr.h
index
843e4fa
..
288d7be
100644
(file)
--- a/
arch/sparc/include/asm/pcr.h
+++ b/
arch/sparc/include/asm/pcr.h
@@
-31,7
+31,7
@@
extern unsigned int picl_shift;
/* In order to commonize as much of the implementation as
* possible, we use PICH as our counter. Mostly this is
/* In order to commonize as much of the implementation as
* possible, we use PICH as our counter. Mostly this is
- * to accomodate Niagara-1 which can only count insn cycles
+ * to accom
m
odate Niagara-1 which can only count insn cycles
* in PICH.
*/
static inline u64 picl_value(unsigned int nmi_hz)
* in PICH.
*/
static inline u64 picl_value(unsigned int nmi_hz)