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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
vreg.h
diff --git
a/arch/arm/mach-msm/include/mach/vreg.h
b/arch/arm/mach-msm/include/mach/vreg.h
index
9f9e25c
..
6626e78
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/vreg.h
+++ b/
arch/arm/mach-msm/include/mach/vreg.h
@@
-23,7
+23,7
@@
struct vreg *vreg_get(struct device *dev, const char *id);
void vreg_put(struct vreg *vreg);
int vreg_enable(struct vreg *vreg);
-
void
vreg_disable(struct vreg *vreg);
+
int
vreg_disable(struct vreg *vreg);
int vreg_set_level(struct vreg *vreg, unsigned mv);
#endif