Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / enic / vnic_enet.h

diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h
index 3b3291248956a4d01848b635bf294f2622c175e7..e8740e3704e495eedbdb4726bc0f48bff72b06ff 100644 (file)
--- a/drivers/net/enic/vnic_enet.h
+++ b/drivers/net/enic/vnic_enet.h
@@ -30,7 +30,7 @@ struct vnic_enet_config {
        u32 wq_desc_count;
        u32 rq_desc_count;
        u16 mtu;
-       u16 intr_timer;
+       u16 intr_timer_deprecated;
        u8 intr_timer_type;
        u8 intr_mode;
        char devname[16];