diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
| commit | eec1ba76a0f043bdea21db10df4287bb5a4d25a8 (patch) | |
| tree | 269e10ce578105322820dd426e30cf9eea7513c6 /drivers/staging/cpc-usb/cpc_int.h | |
| parent | 9fdbbf93bb3bb2b62335e780bb94871fc39dc5d8 (diff) | |
| parent | bb104a76ac0e6c103c36623616c7dee8cd9d165c (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/cpc-usb/cpc_int.h')
| -rw-r--r-- | drivers/staging/cpc-usb/cpc_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/cpc-usb/cpc_int.h b/drivers/staging/cpc-usb/cpc_int.h index a0d60c080819..38674e9690a0 100644 --- a/drivers/staging/cpc-usb/cpc_int.h +++ b/drivers/staging/cpc-usb/cpc_int.h @@ -39,10 +39,10 @@ typedef void (*chan_write_byte_t) (void *chan, unsigned int reg, typedef unsigned char (*chan_read_byte_t) (void *chan, unsigned int reg); typedef struct CPC_CHAN { - void __iomem * canBase; // base address of SJA1000 - chan_read_byte_t read_byte; // CAN controller read access routine - chan_write_byte_t write_byte; // CAN controller write access routine - CPC_MSG_T *buf; // buffer for CPC msg + void __iomem * canBase; /* base address of SJA1000 */ + chan_read_byte_t read_byte; /* CAN controller read access routine */ + chan_write_byte_t write_byte; /* CAN controller write access routine */ + CPC_MSG_T *buf; /* buffer for CPC msg */ unsigned int iidx; unsigned int oidx; unsigned int WnR; |