From a33c36565e763c521cb362965219bb8e70214dd9 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 18 Jan 2010 15:35:08 +0000
Subject: [PATCH] --- yaml --- r: 186711 b: refs/heads/master c:
 f7ae1957cac1388e7bbe070b13a5f5f5a98107d2 h: refs/heads/master i:   186709:
 99670e56c121e05e1a5d0f69d70055a3e32df09d   186707:
 a11be4c9363eadf6c1ddd366cc556f7dcd8519c3   186703:
 dff71c7a62b5902a751ce6b01f3b4d4a609aecfc v: v3

---
 [refs]                                        |  2 +-
 .../staging/et131x/et1310_address_map.h       | 23 +++++--------------
 trunk/drivers/staging/et131x/et131x_isr.c     |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 011e79f677f6..7f595af67d33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287acb63a593c9872005824d6866937617624668
+refs/heads/master: f7ae1957cac1388e7bbe070b13a5f5f5a98107d2
diff --git a/trunk/drivers/staging/et131x/et1310_address_map.h b/trunk/drivers/staging/et131x/et1310_address_map.h
index 9441fe664d51..f8a918928183 100644
--- a/trunk/drivers/staging/et131x/et1310_address_map.h
+++ b/trunk/drivers/staging/et131x/et1310_address_map.h
@@ -863,23 +863,12 @@ typedef union _RXMAC_UNI_PF_ADDR3_t {
 /*
  * structure for Rx Queue Dialog reg in rxmac address map.
  * located at address 0x4090
+ *
+ * 31-26: reserved
+ * 25-16: rd_ptr
+ * 15-10: reserved
+ * 9-0: wr_ptr
  */
-typedef union _RXMAC_RXQ_DIAG_t {
-	u32 value;
-	struct {
-#ifdef _BIT_FIELDS_HTOL
-		u32 reserved2:6;	/* bits 26-31 */
-		u32 rd_ptr:10;	/* bits 16-25 */
-		u32 reserved1:6;	/* bits 10-15 */
-		u32 wr_ptr:10;	/* bits 0-9 */
-#else
-		u32 wr_ptr:10;	/* bits 0-9 */
-		u32 reserved1:6;	/* bits 10-15 */
-		u32 rd_ptr:10;	/* bits 16-25 */
-		u32 reserved2:6;	/* bits 26-31 */
-#endif
-	} bits;
-} RXMAC_RXQ_DIAG_t, *PRXMAC_RXQ_DIAG_t;
 
 /*
  * structure for space availiable reg in rxmac address map.
@@ -984,7 +973,7 @@ typedef struct _RXMAC_t {				/* Location: */
 	u32 pf_ctrl;					/*  0x4084 */
 	u32 mcif_ctrl_max_seg;				/*  0x4088 */
 	u32 mcif_water_mark;				/*  0x408C */
-	RXMAC_RXQ_DIAG_t rxq_diag;			/*  0x4090 */
+	u32 rxq_diag;					/*  0x4090 */
 	RXMAC_SPACE_AVAIL_t space_avail;		/*  0x4094 */
 
 	RXMAC_MIF_CTL_t mif_ctrl;			/*  0x4098 */
diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c
index aa36e40ec248..5ff8665e687b 100644
--- a/trunk/drivers/staging/et131x/et131x_isr.c
+++ b/trunk/drivers/staging/et131x/et131x_isr.c
@@ -446,7 +446,7 @@ void et131x_isr_handler(struct work_struct *work)
 			dev_warn(&etdev->pdev->dev,
 				    "Enable 0x%08x, Diag 0x%08x\n",
 				    readl(&iomem->rxmac.ctrl.value),
-				    readl(&iomem->rxmac.rxq_diag.value));
+				    readl(&iomem->rxmac.rxq_diag));
 
 			/*
 			 * If we are debugging, we want to see this error,