Pull bugzilla-7349 into test branch

diff --cc drivers/acpi/video.c
index cf60ca5515d2ac969a6413e005909735d27304f9,6f760b51ca2deeafe7f2b571b29c3f51b1c21737..a695aeb8b2a74f89ca56e0e53923ae6938e2d731
--- 1/drivers/acpi/video.c
--- 2/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")