Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / w1-gpio.h

diff --git a/include/linux/w1-gpio.h b/include/linux/w1-gpio.h
index 3adeff82212f80aa95bca4456c56355706a18bfa..065e3ae79ab0e7f09138cceb19d8f35ce6d72d67 100644 (file)
--- a/include/linux/w1-gpio.h
+++ b/include/linux/w1-gpio.h
@@ -19,6 +19,7 @@ struct w1_gpio_platform_data {
        unsigned int pin;
        unsigned int is_open_drain:1;
        void (*enable_external_pullup)(int enable);
+       unsigned int ext_pullup_enable_pin;
 };
 
 #endif /* _LINUX_W1_GPIO_H */