summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-07-23 17:32:09 +0200
committerKoen Kooi <koen@openembedded.org>2009-07-23 17:32:09 +0200
commit6dabb1c806e24a2e31d3294327d3eb3e87a347e3 (patch)
tree940f0d00e73555df49f8084183c8fa18fc7a5760 /recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff
parentfae2d88eb20c5d80cc48743c556c5c532afc7304 (diff)
linux-omap psp: add 'psp' kernel from TI to make it easier to do side-by-side comparisons of mainline and TI
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff')
-rw-r--r--recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff19
1 files changed, 19 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff b/recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff
new file mode 100644
index 0000000000..7ca627d67d
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.29/fix-twl-merge-damage.diff
@@ -0,0 +1,19 @@
+--- /tmp/twl4030-regulator.c 2009-07-23 14:27:33.000000000 +0200
++++ git/drivers/regulator/twl4030-regulator.c 2009-07-23 14:27:51.000000000 +0200
+@@ -107,16 +107,6 @@
+ return (state & P1_GRP) != 0;
+ }
+
+-static int twl4030reg_is_enabled(struct regulator_dev *rdev)
+-{
+- int state = twl4030reg_grp(rdev);
+-
+- if (state < 0)
+- return state;
+-
+- return (state & P1_GRP) != 0;
+-}
+-
+ static int twl4030reg_enable(struct regulator_dev *rdev)
+ {
+ struct twlreg_info *info = rdev_get_drvdata(rdev);