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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
mips
/
alchemy
/
common
/
power.c
diff --git
a/arch/mips/alchemy/common/power.c
b/arch/mips/alchemy/common/power.c
index
e5916a5
..
647e518
100644
(file)
--- a/
arch/mips/alchemy/common/power.c
+++ b/
arch/mips/alchemy/common/power.c
@@
-130,7
+130,7
@@
static void restore_core_regs(void)
au_writel(sleep_usb[1], USBD_ENABLE);
au_sync();
#else
au_writel(sleep_usb[1], USBD_ENABLE);
au_sync();
#else
- /* enable acc
ce
s to OTG memory */
+ /* enable acc
es
s to OTG memory */
au_writel(au_readl(USB_MSR_BASE + 4) | (1 << 6), USB_MSR_BASE + 4);
au_sync();
au_writel(au_readl(USB_MSR_BASE + 4) | (1 << 6), USB_MSR_BASE + 4);
au_sync();