diff --git a/[refs] b/[refs]
index 2c5f7f8fc3ac..9f4ce546ab13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c02e0d12a9a0a913dee5efd695603b73ee4b729a
+refs/heads/master: d69e85b644dbc8c68dec3b4149941989d4bcc66f
diff --git a/trunk/drivers/media/video/cx25840/cx25840-ir.c b/trunk/drivers/media/video/cx25840/cx25840-ir.c
index 34e284b06dfa..c2b4c14dc9ab 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-ir.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-ir.c
@@ -886,10 +886,10 @@ static int cx25840_ir_tx_write(struct v4l2_subdev *sd, u8 *buf, size_t count,
 	 */
 	for (i = 0; i < n; ) {
 		for (j = 0; j < FIFO_TX_DEPTH / 2 && i < n; j++) {
-			mark = ns_pulse[i] & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
+			mark = ns_pulse[i] & LEVEL_MASK;
 			fifo_pulse[j] = ns_to_pulse_width_count(
 					 ns_pulse[i] &
-					       ~V4L2_SUBDEV_IR_PULSE_LEVEL_MASK,
+					       ~LEVEL_MASK,
 					 ir_state->txclk_divider);
 			if (mark)
 				fifo_pulse[j] &= FIFO_RXTX_LVL;
diff --git a/trunk/include/media/v4l2-subdev.h b/trunk/include/media/v4l2-subdev.h
index bacd52568ef9..08880dd15d2f 100644
--- a/trunk/include/media/v4l2-subdev.h
+++ b/trunk/include/media/v4l2-subdev.h
@@ -360,14 +360,9 @@ struct v4l2_subdev_sensor_ops {
  */
 
 enum v4l2_subdev_ir_mode {
-	V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* space & mark widths in nanosecs */
+	V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* uses struct ir_raw_event records */
 };
 
-/* Data format of data read or written for V4L2_SUBDEV_IR_MODE_PULSE_WIDTH */
-#define V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS	0x7fffffff
-#define V4L2_SUBDEV_IR_PULSE_LEVEL_MASK		0x80000000
-#define V4L2_SUBDEV_IR_PULSE_RX_SEQ_END		0xffffffff
-
 struct v4l2_subdev_ir_parameters {
 	/* Either Rx or Tx */
 	unsigned int bytes_per_data_element; /* of data in read or write call */