Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186692
b: refs/heads/master
c: 461e0e8
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 93ce019 commit 39a0549
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 060a78a07a06d78e64a00a25f4a4a7d5fe7402d1
refs/heads/master: 461e0e8b15864b2f8d7b13a5bf86acf40d7a6fd6
8 changes: 4 additions & 4 deletions trunk/drivers/staging/et131x/et1310_address_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -1648,14 +1648,14 @@ typedef struct _MAC_STAT_t { /* Location: */
/*
* Memory Control Module of JAGCore Address Mapping
*/
typedef struct _MMC_t { /* Location: */
struct mmc_regs { /* Location: */
u32 mmc_ctrl; /* 0x7000 */
u32 sram_access; /* 0x7004 */
u32 sram_word1; /* 0x7008 */
u32 sram_word2; /* 0x700C */
u32 sram_word3; /* 0x7010 */
u32 sram_word4; /* 0x7014 */
} MMC_t, *PMMC_t;
};

/* END OF MMC REGISTER ADDRESS MAP */

Expand Down Expand Up @@ -1685,9 +1685,9 @@ typedef struct _ADDRESS_MAP_t {
MAC_STAT_t macStat;
/* unused section of mac stat address map */
u8 unused_mac_stat[4096 - sizeof(MAC_STAT_t)];
MMC_t mmc;
struct mmc_regs mmc;
/* unused section of mmc address map */
u8 unused_mmc[4096 - sizeof(MMC_t)];
u8 unused_mmc[4096 - sizeof(struct mmc_regs)];
/* unused section of address map */
u8 unused_[1015808];

Expand Down

0 comments on commit 39a0549

Please sign in to comment.