Merge commit 'origin/master' into next

[linux-2.6-omap-h63xx.git] / include / linux / uwb / umc.h

diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index 36a39e34f8d7dd47ff54690f4b255ed88f613a58..4b4fc0f4385578548b70e1bb841599a387b454d9 100644 (file)
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -89,6 +89,8 @@ struct umc_driver {
        void (*remove)(struct umc_dev *);
        int  (*suspend)(struct umc_dev *, pm_message_t state);
        int  (*resume)(struct umc_dev *);
+       int  (*pre_reset)(struct umc_dev *);
+       int  (*post_reset)(struct umc_dev *);
 
        struct device_driver driver;
 };