Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[sfrench/cifs-2.6.git] / include / video / udlfb.h

diff --git a/include/video/udlfb.h b/include/video/udlfb.h
index 3abd327bada64c0fd089131192edcb88da26e916..7d09e54ae54e0f2b1dab07d76cf0be4718f20369 100644 (file)
--- a/include/video/udlfb.h
+++ b/include/video/udlfb.h
@@ -36,12 +36,9 @@ struct dlfb_data {
        struct usb_device *udev;
        struct fb_info *info;
        struct urb_list urbs;
-       struct kref kref;
        char *backing_buffer;
        int fb_count;
        bool virtualized; /* true when physical usb device not present */
-       struct delayed_work init_framebuffer_work;
-       struct delayed_work free_framebuffer_work;
        atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */
        atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */
        char *edid; /* null until we read edid from hw or get from sysfs */