Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / staging / et131x / et1310_address_map.h

diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index ea746ba41faf8e4e2d61a9c26740f082e69c89d2..e6c8cb3828e9ccf82c0af84096e3ba903d8e4d2d 100644 (file)
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -117,7 +117,7 @@
 
 /*
  * Software reset reg at address 0x0028
- * 0:  txdma_sw_reset
+ * 0:  txdma_sw_reset
  * 1:  rxdma_sw_reset
  * 2:  txmac_sw_reset
  * 3:  rxmac_sw_reset
@@ -1052,7 +1052,7 @@ typedef struct _RXMAC_t {                         /* Location: */
  * 4-0: register
  */
 
-#define MII_ADDR(phy,reg)      ((phy) << 8 | (reg))
+#define MII_ADDR(phy, reg)     ((phy) << 8 | (reg))
 
 /*
  * structure for MII Management Control reg in mac address map.
@@ -1249,8 +1249,7 @@ typedef struct _MAC_t {                                   /* Location: */
 /*
  * MAC STATS Module of JAGCore Address Mapping
  */
-struct macstat_regs
-{                                      /* Location: */
+struct macstat_regs {                  /* Location: */
        u32 pad[32];                    /*  0x6000 - 607C */
 
        /* Tx/Rx 0-64 Byte Frame Counter */