summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bevitt <cyfred@gentoo.org>2004-11-06 05:05:34 +0000
committerAndrew Bevitt <cyfred@gentoo.org>2004-11-06 05:05:34 +0000
commit6c35a44e8c4839edae4b6ea1dcc6f4e7da5a70b6 (patch)
treed2a966f03ec07c1c65b37bc6d0d5564a6007c31d
parentFixed ${CC} to $(tc-getCC). bugs 70115. (Manifest recommit) (diff)
downloadgentoo-2-6c35a44e8c4839edae4b6ea1dcc6f4e7da5a70b6.tar.gz
gentoo-2-6c35a44e8c4839edae4b6ea1dcc6f4e7da5a70b6.tar.bz2
gentoo-2-6c35a44e8c4839edae4b6ea1dcc6f4e7da5a70b6.zip
Power management fixes revision
-rw-r--r--media-video/nvidia-kernel/ChangeLog6
-rw-r--r--media-video/nvidia-kernel/Manifest5
-rw-r--r--media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch12
3 files changed, 21 insertions, 2 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 7462d3b44016..86bfbbd15855 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/nvidia-kernel
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.91 2004/10/04 11:03:24 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.92 2004/11/06 05:05:34 cyfred Exp $
+
+ 06 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>;
+ files/1.0.6111/power-suspend-2.6.9-changes.patch:
+ Adding fixes for STANDBY power state to 6111 power suspend patch
*nvidia-kernel-1.0.6111-r2 (04 Oct 2004)
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 2257b0971beb..9a2a6db173aa 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,4 +1,5 @@
MD5 8ce6e8510b5396c685ad67f806351d36 nvidia-kernel-1.0.6106-r1.ebuild 3622
+MD5 6a462e7e556c0dac6899beb5c4fb2dcf nvidia-kernel-1.0.6629.ebuild 3821
MD5 b4a7988f8e10107742f255ea291478c0 nvidia-kernel-1.0.4499.ebuild 4028
MD5 0f6787ff3195ae6452dd584a199e3e31 nvidia-kernel-1.0.6111-r2.ebuild 4113
MD5 c65724336acbdb77c80842d7a9174301 nvidia-kernel-1.0.5332-r1.ebuild 4256
@@ -6,6 +7,7 @@ MD5 99bfcd484af08a27fbf2ea071b0943db nvidia-kernel-1.0.6111-r1.ebuild 3916
MD5 1e48aaa4989010b59109e1c81cd9741f nvidia-kernel-1.0.6111.ebuild 3723
MD5 f189c720f21a41c73a6c292ffec6cdfd nvidia-kernel-1.0.5328-r1.ebuild 4461
MD5 20f6ae4f9076cd8f5dd1d2383d0eaca7 nvidia-kernel-1.0.4496-r3.ebuild 4286
+MD5 487ee4228fff83dc88094e2d81bf1496 nvidia-kernel-1.0.6111-r3.ebuild 4436
MD5 d5bc3ba053815cd1b559cba6bbd36452 nvidia-kernel-1.0.4363-r3.ebuild 4071
MD5 3fcb8dbee827f3cf93162615f7c05123 ChangeLog 22211
MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
@@ -18,6 +20,7 @@ MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r1 163
MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r2 163
MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629 163
MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
@@ -38,7 +41,7 @@ MD5 5dc4b9a2463cb459721ae3e642f6239f files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-m
MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
MD5 bc61be48f85d84f91d2035fa3cc92a47 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6659
MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
-MD5 335be8e5143f2227bcf74718de074343 files/1.0.6111/power-suspend-2.6.9-changes.patch 606
+MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
diff --git a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch b/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
index 8519a47ab15d..ffdfaf0aae3f 100644
--- a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
+++ b/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
@@ -18,3 +18,15 @@
nv_printf(NV_DBG_INFO, "NVRM: ACPI: received standby event\n");
status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
break;
+--- usr/src/nv/nv.c.orig 2004-10-14 13:48:52.673241000 -0400
++++ usr/src/nv/nv.c 2004-10-14 14:00:05.168006416 -0400
+@@ -3745,7 +3745,7 @@
+ u32 state
+ )
+ {
+- return nv_acpi_event(dev, state);
++ return nv_acpi_event(dev, PM_TMP);
+ }
+
+ int
+