diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/cpc-usb/cpc_int.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
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 a0d60c0..38674e9 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; |