Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[~andy/linux] / include / video / trident.h

diff --git a/include/video/trident.h b/include/video/trident.h
index 85ced9d91312d47eec773527bd67b2949bce3f95..b6ce19d1b61be4509b0d6fd2e014ebbb9251cd7e 100644 (file)
--- a/include/video/trident.h
+++ b/include/video/trident.h
@@ -135,6 +135,7 @@
 #define CMD    0x2144
 #define ROP    0x2148
 #define COLOR  0x2160
+#define BGCOLOR        0x2164
 #define SRC1   0x2100
 #define SRC2   0x2104
 #define DST1   0x2108