Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[firefly-linux-kernel-4.4.55.git] / include / video / permedia2.h

diff --git a/include/video/permedia2.h b/include/video/permedia2.h
index c6575b834fef1ba2ad3f2e3fcc6210618d19f0c9..9ce9adbfda2b671dadf1cc6afa6347459083d0f0 100644 (file)
--- a/include/video/permedia2.h
+++ b/include/video/permedia2.h
@@ -58,7 +58,14 @@
 #define PM2R_RD_PALETTE_DATA                           0x4008
 #define PM2R_RD_PIXEL_MASK                             0x4010
 #define PM2R_RD_PALETTE_READ_ADDRESS                   0x4018
+#define PM2R_RD_CURSOR_COLOR_ADDRESS                   0x4020
+#define PM2R_RD_CURSOR_COLOR_DATA                      0x4028
 #define PM2R_RD_INDEXED_DATA                           0x4050
+#define PM2R_RD_CURSOR_DATA                            0x4058
+#define PM2R_RD_CURSOR_X_LSB                           0x4060
+#define PM2R_RD_CURSOR_X_MSB                           0x4068
+#define PM2R_RD_CURSOR_Y_LSB                           0x4070
+#define PM2R_RD_CURSOR_Y_MSB                           0x4078
 
 #define PM2R_START_X_DOM                               0x8000
 #define PM2R_D_X_DOM                                   0x8008