From 646cedc97e761226c09a6df5b80f70fa355cb25f Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 18 Jan 2010 15:32:39 +0000
Subject: [PATCH] --- yaml --- r: 186684 b: refs/heads/master c:
 09b25c6fa36ea3c961e75cede0f86f1fed5c33b5 h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/staging/et131x/et1310_address_map.h | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index c7893e30f431..4ba6a4640290 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fe68019c600ac0b92475654cbee66208dddb800
+refs/heads/master: 09b25c6fa36ea3c961e75cede0f86f1fed5c33b5
diff --git a/trunk/drivers/staging/et131x/et1310_address_map.h b/trunk/drivers/staging/et131x/et1310_address_map.h
index e715e4dcb523..fcd968132263 100644
--- a/trunk/drivers/staging/et131x/et1310_address_map.h
+++ b/trunk/drivers/staging/et131x/et1310_address_map.h
@@ -451,18 +451,6 @@ typedef union _RXDMA_CSR_t {
  * 31-10: unused
  * 9-0: fbr ndesc
  */
-typedef union _RXDMA_FBR_NUM_DES_t {
-	u32 value;
-	struct {
-#ifdef _BIT_FIELDS_HTOL
-		u32 unused:22;		/* bits 10-31 */
-		u32 fbr_ndesc:10;	/* bits 0-9 */
-#else
-		u32 fbr_ndesc:10;	/* bits 0-9 */
-		u32 unused:22;		/* bits 10-31 */
-#endif
-	} bits;
-} RXDMA_FBR_NUM_DES_t, *PRXDMA_FBR_NUM_DES_t;
 
 /*
  * structure for free buffer ring 0 available offset reg in rxdma address map