diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:08 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:08 -0400 |
commit | 446b4665e323a755d5c5390da324134645a809fb (patch) | |
tree | e1d0ec0d26e34c721af15ada124c549cc9f4fede /include/linux/regulator | |
parent | 62696579a0b73c3e51fe654fd7a62e00a0e95ff5 (diff) | |
parent | 36f8250e4d478429a393c20910dcd02772bd0839 (diff) |
Merge remote-tracking branch 'regulator/topic/fan53555' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r-- | include/linux/regulator/fan53555.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h index 5c45c85d52ca..f13880e84d85 100644 --- a/include/linux/regulator/fan53555.h +++ b/include/linux/regulator/fan53555.h | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifndef __FAN53555_H__ | 13 | #ifndef __FAN53555_H__ |
14 | #define __FAN53555_H__ | ||
14 | 15 | ||
15 | /* VSEL ID */ | 16 | /* VSEL ID */ |
16 | enum { | 17 | enum { |