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 'fix/hda' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
prm-regbits-34xx.h
diff --git
a/arch/arm/mach-omap2/prm-regbits-34xx.h
b/arch/arm/mach-omap2/prm-regbits-34xx.h
index c6a7940f42870cab6d613c2194a5713dacef5def..9fd03a2ec95cb72deddc67ad503918ebc409fc93 100644
(file)
--- a/
arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/
arch/arm/mach-omap2/prm-regbits-34xx.h
@@
-409,7
+409,7
@@
/* PM_PREPWSTST_CAM specific bits */
/* PM_PWSTCTRL_USBHOST specific bits */
-#define OMAP3430ES2_SAVEANDRESTORE_SHIFT
(1 << 4)
+#define OMAP3430ES2_SAVEANDRESTORE_SHIFT
4
/* RM_RSTST_PER specific bits */