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 branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-shmobile
/
board-ap4evb.c
diff --git
a/arch/arm/mach-shmobile/board-ap4evb.c
b/arch/arm/mach-shmobile/board-ap4evb.c
index 5b079529c948529c1b503d9744a0c8dc7fe5b886..f59e93919e26c422d7a0f66734c0e2c99397dd49 100644
(file)
--- a/
arch/arm/mach-shmobile/board-ap4evb.c
+++ b/
arch/arm/mach-shmobile/board-ap4evb.c
@@
-1191,7
+1191,7
@@
static void __init ap4evb_init(void)
gpio_request(GPIO_FN_OVCN2_1, NULL);
/* setup USB phy */
- __raw_writew(0x8a0a, 0xE6058130); /* USBCR
2
*/
+ __raw_writew(0x8a0a, 0xE6058130); /* USBCR
4
*/
/* enable FSI2 port A (ak4643) */
gpio_request(GPIO_FN_FSIAIBT, NULL);