Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rga2 / rga2_rop.h

diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h
index d859543d6a45546abcb47d0e031c53aa4f68387a..60d90b8304de82f5bc693cdfd22b036666d4ddf6 100644 (file)
--- a/drivers/video/rockchip/rga2/rga2_rop.h
+++ b/drivers/video/rockchip/rga2/rga2_rop.h
@@ -3,10 +3,7 @@
 \r
 #include "rga2_type.h"\r
 \r
-extern UWORD32 ROP3_code[256];\r
-\r
-#if 0\r
-extern UWORD32 ROP3_code[256] =\r
+UWORD32 ROP3_code[256] =\r
 {\r
     0x00000007, 0x00000451, 0x00006051, 0x00800051, 0x00007041, 0x00800041, 0x00804830, 0x000004f0,//0\r
     0x00800765, 0x000004b0, 0x00000065, 0x000004f4, 0x00000075, 0x000004e6, 0x00804850, 0x00800005,\r
@@ -56,6 +53,5 @@ extern UWORD32 ROP3_code[256] =
     0x00800001, 0x00004850, 0x008004e6, 0x0000004e, 0x008004f4, 0x0000004c, 0x008004b0, 0x00004870,\r
     0x008004f0, 0x00004830, 0x00000048, 0x0080044e, 0x00000051, 0x008004d4, 0x00800451, 0x00800007,//f\r
 };\r
-#endif\r
 \r
 #endif\r