Merge commit 'a7f976c9de3c20cc8cdde4f3dfeeb48a1a89adb7' into honeycomb-mr2-release-to-dalvik-dev

This commit is contained in:
Brian Carlstrom 2011-06-03 12:40:34 -07:00
commit 78d18badef
4 changed files with 6 additions and 1 deletions

View File

@ -43,9 +43,14 @@
#define TEGRA_FB_WIN_BLEND_PREMULT 1
#define TEGRA_FB_WIN_BLEND_COVERAGE 2
#define TEGRA_FB_WIN_FLAG_INVERT_H (1<<0)
#define TEGRA_FB_WIN_FLAG_INVERT_V (1<<1)
#define TEGRA_FB_WIN_FLAG_TILED (1<<2)
struct tegra_fb_windowattr {
__s32 index;
__u32 buff_id;
__u32 flags;
__u32 blend;
__u32 offset;
__u32 offset_u;

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
2011b
2011g