Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / net / qla3xxx.h

diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h
index 9492cee6b083a8580a78fcb6e87b60633c17d2dd..ea94de7fd0719f2bca4fbb7653a365ecf726e81c 100644 (file)
--- a/drivers/net/qla3xxx.h
+++ b/drivers/net/qla3xxx.h
@@ -1093,7 +1093,7 @@ struct ql3_adapter {
        spinlock_t hw_lock;
 
        /* PCI Bus Relative Register Addresses */
-       u8 *mmap_virt_base;     /* stores return value from ioremap() */
+       u8 __iomem *mmap_virt_base;     /* stores return value from ioremap() */
        struct ql3xxx_port_registers __iomem *mem_map_registers;
        u32 current_page;       /* tracks current register page */
 
@@ -1186,8 +1186,8 @@ struct ql3_adapter {
        u32 numPorts;
        struct net_device_stats stats;
        struct workqueue_struct *workqueue;
-       struct work_struct reset_work;
-       struct work_struct tx_timeout_work;
+       struct delayed_work reset_work;
+       struct delayed_work tx_timeout_work;
        u32 max_frame_size;
 };