diff --git a/[refs] b/[refs]
index c9a8e3c33b3f..7092a750417e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bbd9365c83117d7e22ed282ff567ee482a0dfe5
+refs/heads/master: 6414842a82d54464a9b6fee0b038907ac4d052f4
diff --git a/trunk/drivers/staging/cpc-usb/cpc_int.h b/trunk/drivers/staging/cpc-usb/cpc_int.h
index a0d60c080819..38674e9690a0 100644
--- a/trunk/drivers/staging/cpc-usb/cpc_int.h
+++ b/trunk/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;