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 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
core_lca.c
diff --git
a/arch/alpha/kernel/core_lca.c
b/arch/alpha/kernel/core_lca.c
index
4843f6e
..
cb2801c
100644
(file)
--- a/
arch/alpha/kernel/core_lca.c
+++ b/
arch/alpha/kernel/core_lca.c
@@
-133,7
+133,7
@@
conf_read(unsigned long addr)
local_irq_save(flags);
local_irq_save(flags);
- /* Reset status register to avoid lo
o
sing errors. */
+ /* Reset status register to avoid losing errors. */
stat0 = *(vulp)LCA_IOC_STAT0;
*(vulp)LCA_IOC_STAT0 = stat0;
mb();
stat0 = *(vulp)LCA_IOC_STAT0;
*(vulp)LCA_IOC_STAT0 = stat0;
mb();
@@
-170,7
+170,7
@@
conf_write(unsigned long addr, unsigned int value)
local_irq_save(flags); /* avoid getting hit by machine check */
local_irq_save(flags); /* avoid getting hit by machine check */
- /* Reset status register to avoid lo
o
sing errors. */
+ /* Reset status register to avoid losing errors. */
stat0 = *(vulp)LCA_IOC_STAT0;
*(vulp)LCA_IOC_STAT0 = stat0;
mb();
stat0 = *(vulp)LCA_IOC_STAT0;
*(vulp)LCA_IOC_STAT0 = stat0;
mb();