camera rk30 : fix conflict when merge 2928
authorroot <root@zyc-desktop.(none)>
Fri, 17 Aug 2012 02:25:57 +0000 (10:25 +0800)
committerroot <root@zyc-desktop.(none)>
Fri, 17 Aug 2012 02:25:57 +0000 (10:25 +0800)
commite392c72196073042938ea2cf4d5ebd503e01f97a
tree29e20592734016b4c7e4c1070ee64aeefd1c1582
parentbfeaf0792a3f768954ef677586ab1ddcf1df46d1
camera rk30 : fix conflict when merge 2928
arch/arm/mach-rk30/include/mach/rk30_camera.h
drivers/media/video/rk30_camera.c
drivers/media/video/rk30_camera_oneframe.c