Merge tag 'v4.4-rc7'

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rga / rga_rop.h

diff --git a/drivers/video/rockchip/rga/rga_rop.h b/drivers/video/rockchip/rga/rga_rop.h
index c4be6352cc0fff91caf9574814c0868b7ffdab8a..685818fc9e68a61cfcfb4f5e61f10c0cadd998ec 100755 (executable)
--- a/drivers/video/rockchip/rga/rga_rop.h
+++ b/drivers/video/rockchip/rga/rga_rop.h
@@ -1,14 +1,12 @@
 #ifndef __RGA_ROP_H__\r
 #define __RGA_ROP_H__\r
 \r
-#include "rga_type.h"\r
-\r
-UWORD32 ROP3_code[256] = \r
+unsigned int ROP3_code[256] =\r
 {\r
     0x00000007, 0x00000451, 0x00006051, 0x00800051, 0x00007041, 0x00800041, 0x00804830, 0x000004f0,//0\r
     0x00800765, 0x000004b0, 0x00000065, 0x000004f4, 0x00000075, 0x000004e6, 0x00804850, 0x00800005,\r
 \r
-    0x00006850, 0x00800050, 0x00805028, 0x00000568, 0x00804031, 0x00000471, 0x002b6071, 0x018037aa,//1 \r
+    0x00006850, 0x00800050, 0x00805028, 0x00000568, 0x00804031, 0x00000471, 0x002b6071, 0x018037aa,//1\r
     0x008007aa, 0x00036071, 0x00002c6a, 0x00803631, 0x00002d68, 0x00802721, 0x008002d0, 0x000006d0,\r
 \r
     0x0080066e, 0x00000528, 0x00000066, 0x0000056c, 0x018007aa, 0x0002e06a, 0x00003471, 0x00834031,//2\r
@@ -28,8 +26,8 @@ UWORD32 ROP3_code[256] =
 \r
     0x00006870, 0x008037a2, 0x00003431, 0x00000745, 0x00002521, 0x00000655, 0x0000346e, 0x00800062,\r
     0x008002f0, 0x000236d0, 0x000026d4, 0x00807028, 0x000036c6, 0x00806031, 0x008005aa, 0x00000671,//7\r
-    \r
-    0x00800671, 0x000005aa, 0x00006031, 0x008036c6, 0x00007028, 0x00802e55, 0x008236d0, 0x000002f0,    \r
+\r
+    0x00800671, 0x000005aa, 0x00006031, 0x008036c6, 0x00007028, 0x00802e55, 0x008236d0, 0x000002f0,\r
     0x00000070, 0x0080346e, 0x00800655, 0x00802521, 0x00800745, 0x00803431, 0x000037a2, 0x00806870,//8\r
 \r
     0x00006830, 0x0080364e, 0x00822f48, 0x00000361, 0x0082b651, 0x00000271, 0x00800231, 0x002b4051,\r