MIPI: fix merge error with develop-3.10
authorxjh <xujh@rock-chips.com>
Mon, 28 Jul 2014 07:54:37 +0000 (15:54 +0800)
committerxjh <xujh@rock-chips.com>
Mon, 28 Jul 2014 07:58:24 +0000 (15:58 +0800)
commita9a4971ca9cac2eeed7766ca9920172118dd526f
tree2ae4d99e3896caddf8b5e914b114590c4f17e658
parentd54505daaf22cfa74853658dbe1e425e9def2c71
MIPI: fix merge error with develop-3.10
drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
drivers/video/rockchip/transmitter/rk32_mipi_dsi.h