rpms/kernel/devel linux-2.6-acpi-video-dos.patch, NONE, 1.1 kernel.spec, 1.843, 1.844

[Matthew Garrett (mjg59)]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3433

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-video-dos.patch 
Log Message:
- disable ACPI video display switching by default


linux-2.6-acpi-video-dos.patch:

--- NEW FILE linux-2.6-acpi-video-dos.patch ---
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index bac2901..93b1a9e 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1818,7 +1818,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 
 static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
-	return acpi_video_bus_DOS(video, 0, 0);
+	return acpi_video_bus_DOS(video, 3, 1);
 }
 
 static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.843
retrieving revision 1.844
diff -u -r1.843 -r1.844
--- kernel.spec	4 Aug 2008 19:45:02 -0000	1.843
+++ kernel.spec	4 Aug 2008 19:55:58 -0000	1.844
@@ -567,6 +567,7 @@
 Patch370: linux-2.6-crash-driver.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
+Patch391: linux-2.6-defaults-acpi-video-dos.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
@@ -1035,6 +1036,9 @@
 
 # ACPI
 
+ApplyPatch linux-2.6-defaults-acpi-video.patch 
+ApplyPatch linux-2.6-acpi-video-dos.patch
+
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
 ApplyPatch linux-2.6-debug-nmi-timeout.patch
@@ -1721,6 +1725,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 04 2008 Matthew Garrett <mjg at redhat.com>
+- disable ACPI video display switching by default
+
 * Mon Aug 04 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc1-git5