Module Name:    src
Committed By:   jruoho
Date:           Thu Feb 24 11:33:41 UTC 2011

Modified Files:
        src/share/man/man4: acpicpu.4

Log Message:
Update.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/acpicpu.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/acpicpu.4
diff -u src/share/man/man4/acpicpu.4:1.22 src/share/man/man4/acpicpu.4:1.23
--- src/share/man/man4/acpicpu.4:1.22	Wed Feb 23 12:38:47 2011
+++ src/share/man/man4/acpicpu.4	Thu Feb 24 11:33:41 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpicpu.4,v 1.22 2011/02/23 12:38:47 jruoho Exp $
+.\" $NetBSD: acpicpu.4,v 1.23 2011/02/24 11:33:41 jruoho Exp $
 .\"
 .\" Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 23, 2011
+.Dd February 24, 2011
 .Dt ACPICPU 4
 .Os
 .Sh NAME
@@ -255,11 +255,10 @@
 .Nm
 driver uses the same
 .Xr sysctl 8
-controls for P-states as the ones provided by the kernel configuration
-.Xr options 4
-.Dv ENHANCED_SPEEDSTEP
+controls for P-states as the ones provided by
+.Xr est 4
 and
-.Dv POWERNOW_K8 .
+.Xr powernow 4 .
 Depending on the processor, the second-level node is either
 .Ic machdep.est
 or
@@ -294,12 +293,12 @@
 The
 .Nm
 driver conflicts with
-.Xr est 4 ,
-and with the following kernel configuration
-.Xr options 4 :
-.Dv POWERNOW_K8
+.Xr est 4
 and
-.Dv INTEL_ONDEMAND_CLOCKMOD .
+.Xr powernow 4
+in addition to the
+.Dv INTEL_ONDEMAND_CLOCKMOD
+kernel configuration option.
 These must be disabled if
 .Nm
 is used.
@@ -323,6 +322,8 @@
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr acpitz 4 ,
+.Xr est 4 ,
+.Xr powernow 4 ,
 .Xr cpu_idle 9
 .Sh HISTORY
 The

Reply via email to