camera : fix conflict when merge to rk30
authorzyc <zyc@rock-chips.com>
Fri, 17 Aug 2012 02:31:42 +0000 (10:31 +0800)
committerzyc <zyc@rock-chips.com>
Fri, 17 Aug 2012 02:31:42 +0000 (10:31 +0800)
commit6ef0af5a9b983cc81192d2b04ea650e0e7cb9a1c
tree5042d197a987bfd3d8cb3165f6afdd2546135d05
parent9e0aa7b6bbef569e756d42a15946cd2b3c445c50
camera : fix conflict when merge to rk30
drivers/media/video/rk30_camera_oneframe.c