summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-18 18:18:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-18 18:18:55 -0700
commit6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389 (patch)
tree1abf25c3b82e67f5afbae34027461623799ddae5 /include
parentb0e7031ac08fa0aa242531c8d9a0cf9ae8ee276d (diff)
parent417e206b16e18bc729346b6db668031498975b8e (diff)
downloadlwn-6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389.tar.gz
lwn-6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389.zip
Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6
* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6: mfd: Fix omap-usb-host build failure mfd: Make omap-usb-host TLL mode work again mfd: Set MAX8997 irq pointer mfd: Fix initialisation of tps65910 interrupts mfd: Check for twl4030-madc NULL pointer mfd: Copy the device pointer to the twl4030-madc structure mfd: Rename wm8350 static gpio_set_debounce() mfd: Fix value of WM8994_CONFIGURE_GPIO
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/wm8994/pdata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index d12f8d635a81..97cf4f27d647 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -26,7 +26,7 @@ struct wm8994_ldo_pdata {
struct regulator_init_data *init_data;
};
-#define WM8994_CONFIGURE_GPIO 0x8000
+#define WM8994_CONFIGURE_GPIO 0x10000
#define WM8994_DRC_REGS 5
#define WM8994_EQ_REGS 20