From: Andrew Morton <akpm@osdl.org>

Cc: Pavel Machek <pavel@suse.cz>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/acpi.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN include/linux/acpi.h~suspend-to-ram-allow-video-options-to-be-set-at-runtime-fix include/linux/acpi.h
--- devel/include/linux/acpi.h~suspend-to-ram-allow-video-options-to-be-set-at-runtime-fix	2006-01-24 17:57:01.000000000 -0800
+++ devel-akpm/include/linux/acpi.h	2006-01-24 17:57:01.000000000 -0800
@@ -427,7 +427,8 @@ extern int acpi_mp_config;
 extern struct acpi_table_mcfg_config *pci_mmcfg_config;
 extern int pci_mmcfg_config_num;
 
-extern int sbf_port ;
+extern int sbf_port;
+extern unsigned long acpi_video_flags;
 
 #else	/* !CONFIG_ACPI */
 
_