From bf03a47915ead33639d2212f5c33cdef49cfe90c Mon Sep 17 00:00:00 2001
From: Dennis Munsie <dmunsie@cecropia.com>
Date: Tue, 20 Jun 2006 14:55:55 -0400
Subject: [PATCH] --- yaml --- r: 37247 b: refs/heads/master c:
 399fb4316ab4fe4c46d1e4ed8b12d56c94b4c251 h: refs/heads/master i:   37245:
 95986a3470a593d528d72c89971e9b243d3a53cf   37243:
 cf0d16dfaaf545cb0fd4dbe1cd045a9a47c58236   37239:
 5bc37cbb15a8d05e1328538b9bdca69b82fa0bcb   37231:
 b48256d38ab0f114591affdf37b4edd4aa9af9c3   37215:
 7affdda2f393ebad9c9ff4b7f53d776e079c10fe   37183:
 beeb4250dba616645880328abe8010a636cdd336   37119:
 59353a1f87177b64b15b107891ed8099463aef12 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/video/intelfb/intelfb.h | 29 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4754d53f2852..82433f27e3ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183b1214402a205bf6eea2030686249c7d365fd1
+refs/heads/master: 399fb4316ab4fe4c46d1e4ed8b12d56c94b4c251
diff --git a/trunk/drivers/video/intelfb/intelfb.h b/trunk/drivers/video/intelfb/intelfb.h
index 5a216b81aa23..179db05f1954 100644
--- a/trunk/drivers/video/intelfb/intelfb.h
+++ b/trunk/drivers/video/intelfb/intelfb.h
@@ -119,6 +119,24 @@
 /* Intel agpgart driver */
 #define AGP_PHYSICAL_MEMORY     2
 
+/* these are outputs from the chip - integrated only
+   external chips are via DVO or SDVO output */
+#define INTELFB_OUTPUT_UNUSED 0
+#define INTELFB_OUTPUT_ANALOG 1
+#define INTELFB_OUTPUT_DVO 2
+#define INTELFB_OUTPUT_SDVO 3
+#define INTELFB_OUTPUT_LVDS 4
+#define INTELFB_OUTPUT_TVOUT 5
+
+#define INTELFB_DVO_CHIP_NONE 0
+#define INTELFB_DVO_CHIP_LVDS 1
+#define INTELFB_DVO_CHIP_TMDS 2
+#define INTELFB_DVO_CHIP_TVOUT 4
+
+#define INTELFB_OUTPUT_PIPE_NC  0
+#define INTELFB_OUTPUT_PIPE_A   1
+#define INTELFB_OUTPUT_PIPE_B   2
+
 /*** Data Types ***/
 
 /* supported chipsets */
@@ -221,6 +239,17 @@ struct intelfb_i2c_chan {
 };
 #endif
 
+struct intelfb_output_rec {
+    int type;
+    int pipe;
+    int flags;
+
+#ifdef CONFIG_FB_INTEL_I2C
+    struct intelfb_i2c_chan i2c_bus;
+    struct intelfb_i2c_chan ddc_bus;
+#endif
+};
+
 struct intelfb_vsync {
 	wait_queue_head_t wait;
 	unsigned int count;