Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rk30 / include / mach / rk30_camera.h

diff --git a/arch/arm/mach-rk30/include/mach/rk30_camera.h b/arch/arm/mach-rk30/include/mach/rk30_camera.h
index 38e771f81e8c08f55569828d30534046757b13ab..85391efff2e304668aaa99b99a8a783abf786fb0 100755 (executable)
--- a/arch/arm/mach-rk30/include/mach/rk30_camera.h
+++ b/arch/arm/mach-rk30/include/mach/rk30_camera.h
@@ -18,11 +18,11 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#ifndef __ASM_ARCH_CAMERA_RK30_H_\r
+#ifndef __ASM_ARCH_CAMERA_RK30_H_
+#define __ASM_ARCH_CAMERA_RK30_H_
 
-#define __ASM_ARCH_CAMERA_RK29_H_
 #ifdef CONFIG_ARCH_RK30
-#define RK29_CAM_DRV_NAME "rk-camera-rk30"\r
+#define RK29_CAM_DRV_NAME "rk-camera-rk30"
 #define RK_SUPPORT_CIF0   1
 #define RK_SUPPORT_CIF1   1
 #endif
@@ -32,7 +32,8 @@
 #define RK_SUPPORT_CIF0   1
 #define RK_SUPPORT_CIF1   0
 #endif
+
 #include <plat/rk_camera.h>
 
-#endif\r
-\r
+#endif
+