From 93ce019c134654f1ce603dfc9c4c71eae0f25dbd Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 18 Jan 2010 15:33:18 +0000 Subject: [PATCH] --- yaml --- r: 186691 b: refs/heads/master c: 060a78a07a06d78e64a00a25f4a4a7d5fe7402d1 h: refs/heads/master i: 186689: c4dea5604d3d9385d23f31641b71ff1542e6449b 186687: faeced9e35713de9ea56143d4d1448afec01ca9e v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_address_map.h | 8 ++++---- trunk/drivers/staging/et131x/et1310_tx.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8e9973b64d88..38e980cd6a74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b903327d34a48250da3f559a8906f3a55db9901 +refs/heads/master: 060a78a07a06d78e64a00a25f4a4a7d5fe7402d1 diff --git a/trunk/drivers/staging/et131x/et1310_address_map.h b/trunk/drivers/staging/et131x/et1310_address_map.h index 16254b7603a1..43bd3034d495 100644 --- a/trunk/drivers/staging/et131x/et1310_address_map.h +++ b/trunk/drivers/staging/et131x/et1310_address_map.h @@ -253,7 +253,7 @@ extern inline void add_12bit(u32 *v, int n) * Tx DMA Module of JAGCore Address Mapping * Located at address 0x1000 */ -typedef struct _TXDMA_t { /* Location: */ +struct txdma_regs { /* Location: */ u32 csr; /* 0x1000 */ u32 pr_base_hi; /* 0x1004 */ u32 pr_base_lo; /* 0x1008 */ @@ -280,7 +280,7 @@ typedef struct _TXDMA_t { /* Location: */ u32 DroppedTLPCount; /* 0x105c */ u32 NewServiceComplete; /* 0x1060 */ u32 EthernetPacketCount; /* 0x1064 */ -} TXDMA_t, *PTXDMA_t; +}; /* END OF TXDMA REGISTER ADDRESS MAP */ @@ -1667,9 +1667,9 @@ typedef struct _ADDRESS_MAP_t { struct global_regs global; /* unused section of global address map */ u8 unused_global[4096 - sizeof(struct global_regs)]; - TXDMA_t txdma; + struct txdma_regs txdma; /* unused section of txdma address map */ - u8 unused_txdma[4096 - sizeof(TXDMA_t)]; + u8 unused_txdma[4096 - sizeof(struct txdma_regs)]; struct rxdma_regs rxdma; /* unused section of rxdma address map */ u8 unused_rxdma[4096 - sizeof(struct rxdma_regs)]; diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c index 977e8b34e7a6..b0cb0579026e 100644 --- a/trunk/drivers/staging/et131x/et1310_tx.c +++ b/trunk/drivers/staging/et131x/et1310_tx.c @@ -200,7 +200,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter) */ void ConfigTxDmaRegs(struct et131x_adapter *etdev) { - struct _TXDMA_t __iomem *txdma = &etdev->regs->txdma; + struct txdma_regs __iomem *txdma = &etdev->regs->txdma; /* Load the hardware with the start of the transmit descriptor ring. */ writel((u32) ((u64)etdev->tx_ring.tx_desc_ring_pa >> 32),