From eea180919562b4d7f78c831a70812a90793f696a Mon Sep 17 00:00:00 2001
From: DanielC <puff65537@bansheeslibrary.com>
Date: Mon, 10 Sep 2012 19:41:51 -0700
Subject: [PATCH] --- yaml --- r: 325067 b: refs/heads/master c:
 6690da5fdc2056b78376919944886c78defcba5f h: refs/heads/master i:   325065:
 8b93b2f08448e3c9aa747dad258bde21cfe2376c   325063:
 3faf5e977c7f5b230d5107e3e1ae6fc00bb2abd2 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/silicom/bp_ioctl.h | 2 +-
 trunk/drivers/staging/silicom/libbp_sd.h | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd9949f665c8..cb7ec3f2ed3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909ff71041262f1e9de465dd8c0fee6da17747fd
+refs/heads/master: 6690da5fdc2056b78376919944886c78defcba5f
diff --git a/trunk/drivers/staging/silicom/bp_ioctl.h b/trunk/drivers/staging/silicom/bp_ioctl.h
index 7621fe8176bc..7d468a0ee79a 100644
--- a/trunk/drivers/staging/silicom/bp_ioctl.h
+++ b/trunk/drivers/staging/silicom/bp_ioctl.h
@@ -53,7 +53,7 @@
 #define WDT_STEP_TIME              0x10	/* BIT_4 */
 
 #define WD_MIN_TIME_GET(desc)   (desc & 0xf)
-#define WD_STEP_COUNT_GET(desc) (desc>>5) & 0xf
+#define WD_STEP_COUNT_GET(desc) ((desc>>5) & 0xf)
 
 typedef enum {
 	IF_SCAN,
diff --git a/trunk/drivers/staging/silicom/libbp_sd.h b/trunk/drivers/staging/silicom/libbp_sd.h
index 1ba8b8405bcf..d223a6cfca27 100644
--- a/trunk/drivers/staging/silicom/libbp_sd.h
+++ b/trunk/drivers/staging/silicom/libbp_sd.h
@@ -42,7 +42,6 @@
 #define NIC_CAP_NEG              0x4000000	/* BIT 26 */
 
 #define WD_MIN_TIME_GET(desc)   (desc & 0xf)
-#define WD_STEP_COUNT_GET(desc) (desc>>5) & 0xf
 #define WDT_STEP_TIME           0x10
 
 struct bp_info {