Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk_camsys / camsys_internal.h

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 5a66051a2c445a457c39feb46b95bd33843759fb..a4daf9829f8805a5055962a466da83dfd3c4aa79 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -28,6 +28,7 @@
 #include <linux/mutex.h>
 #include <linux/regulator/machine.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 //#include <mach/io.h>
 //#include <mach/gpio.h>
 //#include <mach/iomux.h>
@@ -36,8 +37,6 @@
 #include <linux/rockchip/iomap.h>
 #include <linux/rockchip/grf.h>
 
-#include <asm/gpio.h>
-#include <asm/system.h>        
 #include <asm/uaccess.h>
 
 #include <linux/of.h>