Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[mirror_ubuntu-bionic-kernel.git] / include / linux / w1-gpio.h

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