recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff

   1 --- /tmp/twl4030-regulator.c    2009-07-23 14:27:33.000000000 +0200
   2 +++ git/drivers/regulator/twl4030-regulator.c   2009-07-23 14:27:51.000000000 +0200
   3 @@ -107,16 +107,6 @@
   4         return (state & P1_GRP) != 0;
   5  }
   6
   7 -static int twl4030reg_is_enabled(struct regulator_dev *rdev)
   8 -{
   9 -       int     state = twl4030reg_grp(rdev);
  10 -
  11 -       if (state < 0)
  12 -               return state;
  13 -
  14 -       return (state & P1_GRP) != 0;
  15 -}
  16 -
  17  static int twl4030reg_enable(struct regulator_dev *rdev)
  18  {
  19         struct twlreg_info      *info = rdev_get_drvdata(rdev);