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

[~andy/linux] / include / linux / w1-gpio.h

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