From 2bbd09d95bcceb667f989e1673c717f2a75ec36f Mon Sep 17 00:00:00 2001
From: Roopa Prabhu <roprabhu@cisco.com>
Date: Tue, 10 Aug 2010 18:55:26 +0000
Subject: [PATCH] --- yaml --- r: 213810 b: refs/heads/master c:
 1f76da51f58eda3a027e71e98404b80fcad2d80d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/enic/vnic_enet.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1a5536676a4..d1df3cb36740 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 832177901a61aeda1f2122e323c39881ec84af65
+refs/heads/master: 1f76da51f58eda3a027e71e98404b80fcad2d80d
diff --git a/trunk/drivers/net/enic/vnic_enet.h b/trunk/drivers/net/enic/vnic_enet.h
index 3b3291248956..e8740e3704e4 100644
--- a/trunk/drivers/net/enic/vnic_enet.h
+++ b/trunk/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];