Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338079
b: refs/heads/master
c: 185b34d
h: refs/heads/master
i:
  338077: c057f9b
  338075: e07f9b9
  338071: 541fd0d
  338063: 622c3ba
  338047: 3fb0f9c
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 189377c commit ec0f1cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: dec80537cc2bcfc28d692f62a6dbbba26ed69238
refs/heads/master: 185b34d2b18dbaff8a18962ca84f90016c90ff07
12 changes: 6 additions & 6 deletions trunk/drivers/staging/cxt1e1/musycc.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
#define INT_QUEUE_SIZE MUSYCC_NIQD

/* RAM image of MUSYCC registers laid out as a C structure */
struct musycc_groupr
{
struct musycc_groupr
{
VINT32 thp[32]; /* Transmit Head Pointer [5-29] */
VINT32 tmp[32]; /* Transmit Message Pointer [5-30] */
VINT32 rhp[32]; /* Receive Head Pointer [5-29] */
Expand All @@ -67,11 +67,11 @@
VINT32 mpd; /* Memory Protection Descriptor [5-18] */
VINT32 mld; /* Message Length Descriptor [5-20] */
VINT32 pcd; /* Port Configuration Descriptor [5-19] */
};
};

/* hardware MUSYCC registers laid out as a C structure */
struct musycc_globalr
{
struct musycc_globalr
{
VINT32 gbp; /* Group Base Pointer */
VINT32 dacbp; /* Dual Address Cycle Base Pointer */
VINT32 srd; /* Service Request Descriptor */
Expand Down Expand Up @@ -100,7 +100,7 @@
VINT32 pcd; /* Port Configuration Descriptor [5-19] */
VINT32 rbist; /* Receive BIST status [5-4] */
VINT32 tbist; /* Receive BIST status [5-4] */
};
};

/* Global Config Descriptor bit macros */
#define MUSYCC_GCD_ECLK_ENABLE 0x00000800 /* EBUS clock enable */
Expand Down

0 comments on commit ec0f1cb

Please sign in to comment.