diff options
author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-09 16:58:31 +0530 |
---|---|---|
committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-09 16:58:31 +0530 |
commit | ae385299e0faf14d8b81de24f3649d096a841744 (patch) | |
tree | 1b22c7c02ade387b49dae505fe2b2164e24b7232 /include | |
parent | 49111eb5b680a9f2e2ea196ffaf7dd80a7f02e93 (diff) | |
parent | e51ab3740df4c2880507045f999c4bde3563c6a2 (diff) |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/video/tegra/dc/hdmi.c
Change-Id: Ia65c693bf49160e3906df68403129ba1e5545912
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 3e816a73b448..ea50f3fd6eab 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -446,6 +446,8 @@ struct file; #define FB_MISC_PRIM_COLOR 1 #define FB_MISC_1ST_DETAIL 2 /* First Detailed Timing is preferred */ +#define FB_MISC_HDMI 4 /* display supports HDMI signaling */ + struct fb_chroma { __u32 redx; /* in fraction of 1024 */ __u32 greenx; |