---

yaml --- r: 344535 b: refs/heads/master c: 99a2c61 h: refs/heads/master i: 344533: 9ad9a42 344531: ec143f9 344527: 1fbc264 v: v3
git-mirror · Nov 26, 2012 · 1bac3e4 · 1bac3e4
1 parent 4f43c49
commit 1bac3e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d07a0bf444c7bafc940ea8f3ba1b1bbbed09793
+refs/heads/master: 99a2c61e639063803348c71c760c2fc272e83ec6
diff --git a/trunk/include/video/samsung_fimd.h b/trunk/include/video/samsung_fimd.h
@@ -237,6 +237,9 @@
 /* Local input channels (windows 0-2) */
 #define SHADOWCON_CHx_LOCAL_ENABLE(_win)	(1 << (5 + (_win)))
 
+/* VIDOSDx */
+
+#define VIDOSD_BASE				(0x40)
 #define VIDOSDxA_TOPLEFT_X_E(_x)		((((_x) & 0x800) >> 11) << 23)
 #define VIDOSDxA_TOPLEFT_X_MASK			(0x7ff << 11)
 #define VIDOSDxA_TOPLEFT_X_SHIFT		(11)
@@ -408,10 +411,6 @@
 #define S3C_FB_MAX_WIN (5)  /* number of hardware windows available. */
 #define VIDCON1_FSTATUS_EVEN	(1 << 15)
 
-/* OSD1 and OSD4 do not have register D */
-
-#define VIDOSD_BASE				(0x40)
-
 #define VIDINTCON0				(0x130)
 
 #define VIDINTCON0_FIFIOSEL_WINDOW2		(0x10 << 5)