target/linux/imx6/patches-3.10/0021-regulator-pfuze100-fix-build-warning-and-correct-the.patch

   1 From: Robin Gong <b38343@freescale.com>
   2 Subject: [PATCH] regulator:pfuze100: fix build warning and correct the binding
   3  doc
   4
   5 fix building warning and correct the binding doc
   6
   7 Signed-off-by: Robin Gong <b38343@freescale.com>
   8 Signed-off-by: Mark Brown <broonie@linaro.org>
   9 ---
  10  Documentation/devicetree/bindings/regulator/pfuze100.txt | 2 ++
  11  drivers/regulator/pfuze100-regulator.c                   | 2 +-
  12  2 files changed, 3 insertions(+), 1 deletion(-)
  13
  14 --- a/Documentation/devicetree/bindings/regulator/pfuze100.txt
  15 +++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt
  16 @@ -3,6 +3,8 @@ PFUZE100 family of regulators
  17  Required properties:
  18  - compatible: "fsl,pfuze100"
  19  - reg: I2C slave address
  20 +
  21 +Required child node:
  22  - regulators: This is the list of child nodes that specify the regulator
  23    initialization data for defined regulators. Please refer to below doc
  24    Documentation/devicetree/bindings/regulator/regulator.txt.
  25 --- a/drivers/regulator/pfuze100-regulator.c
  26 +++ b/drivers/regulator/pfuze100-regulator.c
  27 @@ -295,7 +295,7 @@ static inline struct device_node *match_
  28  #else
  29  static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
  30  {
  31 -       return NULL;
  32 +       return 0;
  33  }
  34
  35  static inline struct regulator_init_data *match_init_data(int index)