summaryrefslogtreecommitdiff
path: root/include/linux/i2c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-12-07 19:10:58 +0100
committerSamuel Ortiz <samuel@sortiz.org>2009-01-04 12:17:40 +0100
commitb73eac7871d002835be17d4602cced2c15c0db4b (patch)
tree0d664f8baf38f20eb8557ad6148377a1eef21899 /include/linux/i2c
parentdad759ff8ba79927766e3f0159bfc5fb6de0f982 (diff)
downloadlinux-next-b73eac7871d002835be17d4602cced2c15c0db4b.tar.gz
mfd: twl4030 regulator bug fixes
This contains two bugfixes to the initial twl4030 regulator support patch related to USB: (a) always overwrite the old list of consumers ... else the regulator handles all use the same "usb1v5" name; (b) don't set up the "usbcp" regulator, which turns out to be managed through separate controls, usually ULPI directly from the OTG controller. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'include/linux/i2c')
-rw-r--r--include/linux/i2c/twl4030.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index e06555d40d35..a8f84c01f82e 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -354,6 +354,5 @@ int twl4030_set_gpio_debounce(int gpio, int enable);
#define TWL4030_REG_VUSB1V5 17
#define TWL4030_REG_VUSB1V8 18
#define TWL4030_REG_VUSB3V1 19
-#define TWL4030_REG_VUSBCP 20
#endif /* End of __TWL4030_H */