From: Len Brown <len.brown@intel.com>
Date: Sat, 3 Feb 2007 03:42:44 +0000 (-0500)
Subject: Pull bugzilla-7349 into test branch
X-Git-Tag: v2.6.21-rc2~42^2~12^2^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c6f4bc211122c86de85a6c93f139319957fd1f8a;p=linux-2.6-omap-h63xx.git

Pull bugzilla-7349 into test branch
---

c6f4bc211122c86de85a6c93f139319957fd1f8a
diff --cc drivers/acpi/video.c
index cf60ca5515d,6f760b51ca2..a695aeb8b2a
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -57,8 -56,12 +57,13 @@@
  
  #define ACPI_VIDEO_HEAD_INVALID		(~0u - 1)
  #define ACPI_VIDEO_HEAD_END		(~0u)
 +#define MAX_NAME_LEN	20
  
+ #define ACPI_VIDEO_DISPLAY_CRT	1
+ #define ACPI_VIDEO_DISPLAY_TV	2
+ #define ACPI_VIDEO_DISPLAY_DVI	3
+ #define ACPI_VIDEO_DISPLAY_LCD	4
+ 
  #define _COMPONENT		ACPI_VIDEO_COMPONENT
  ACPI_MODULE_NAME("acpi_video")