Module Name:    src
Committed By:   jruoho
Date:           Thu Apr  8 17:53:42 UTC 2010

Modified Files:
        src/share/man/man4: acpiwmi.4 hpqlb.4

Log Message:
Note the conflict between wmihp(4) and hpqlb(4).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/acpiwmi.4
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/hpqlb.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/acpiwmi.4
diff -u src/share/man/man4/acpiwmi.4:1.2 src/share/man/man4/acpiwmi.4:1.3
--- src/share/man/man4/acpiwmi.4:1.2	Thu Apr  8 17:44:22 2010
+++ src/share/man/man4/acpiwmi.4	Thu Apr  8 17:53:42 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpiwmi.4,v 1.2 2010/04/08 17:44:22 jruoho Exp $
+.\" $NetBSD: acpiwmi.4,v 1.3 2010/04/08 17:53:42 jruoho Exp $
 .\"
 .\" Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
 .\" All rights reserved.
@@ -97,3 +97,8 @@
 should provide a certain degree of portability across laptop
 models from a particular vendor, there is no guarantee that the mappings
 are functional in all models.
+.Pp
+The
+.Sy wmihp
+driver conflicts with
+.Xr hpqlb 4 .

Index: src/share/man/man4/hpqlb.4
diff -u src/share/man/man4/hpqlb.4:1.4 src/share/man/man4/hpqlb.4:1.5
--- src/share/man/man4/hpqlb.4:1.4	Mon May 19 07:53:22 2008
+++ src/share/man/man4/hpqlb.4	Thu Apr  8 17:53:42 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: hpqlb.4,v 1.4 2008/05/19 07:53:22 wiz Exp $
+.\" $NetBSD: hpqlb.4,v 1.5 2010/04/08 17:53:42 jruoho Exp $
 .\"
 .\" Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
 .\" 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 May 18, 2008
+.Dd April 8, 2010
 .Dt HPQLB 4
 .Os
 .Sh NAME
@@ -63,3 +63,8 @@
 .Nx
 by
 .An Christoph Egger .
+.Sh CAVEATS
+The
+.Nm
+driver conflicts with
+.Xr acpiwmi 4 .

Reply via email to