Module Name: src
Committed By: cnst
Date: Fri Mar 19 04:04:28 UTC 2010
Modified Files:
src/share/man/man4: Makefile acpi.4
src/sys/arch/i386/conf: ALL
src/sys/dev: DEVNAMES
src/sys/dev/acpi: files.acpi
src/usr.sbin/envstat: envstat.8
Removed Files:
src/share/man/man4: aiboost.4
src/sys/dev/acpi: aiboost.c
Log Message:
Remove aiboost(4) as obsolete and redundant since the introduction of aibs(4).
http://mail-index.netbsd.org/tech-kern/2010/03/06/msg007458.html
Reviewed by <pgoyette>, <cegger>, <jruoho>, <tech-kern>.
To generate a diff of this commit:
cvs rdiff -u -r1.511 -r1.512 src/share/man/man4/Makefile
cvs rdiff -u -r1.42 -r1.43 src/share/man/man4/acpi.4
cvs rdiff -u -r1.2 -r0 src/share/man/man4/aiboost.4
cvs rdiff -u -r1.249 -r1.250 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.258 -r1.259 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.30 -r0 src/sys/dev/acpi/aiboost.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/envstat/envstat.8
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/Makefile
diff -u src/share/man/man4/Makefile:1.511 src/share/man/man4/Makefile:1.512
--- src/share/man/man4/Makefile:1.511 Thu Mar 11 10:38:37 2010
+++ src/share/man/man4/Makefile Fri Mar 19 04:04:27 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.511 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: Makefile,v 1.512 2010/03/19 04:04:27 cnst Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \
adbbt.4 adbkbd.4 adbms.4 \
adc.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \
ahcisata.4 ahd.4 \
- aiboost.4 aibs.4 ale.4 alipm.4 altmem.4 amdpm.4 amdtemp.4 amhphy.4 \
+ aibs.4 ale.4 alipm.4 altmem.4 amdpm.4 amdtemp.4 amhphy.4 \
amr.4 aps.4 \
an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
ath.4 atphy.4 atppc.4 attimer.4 atw.4 \
@@ -144,6 +144,7 @@
MLINKS+=drm.4 viadrm.4
MLINKS+=acpiec.4 acpiecdt.4
+MLINKS+=aibs.4 aiboost.4
MLINKS+=ata.4 atabus.4
MLINKS+=audio.4 audioctl.4
MLINKS+=audio.4 mixer.4
Index: src/share/man/man4/acpi.4
diff -u src/share/man/man4/acpi.4:1.42 src/share/man/man4/acpi.4:1.43
--- src/share/man/man4/acpi.4:1.42 Sat Mar 6 06:25:51 2010
+++ src/share/man/man4/acpi.4 Fri Mar 19 04:04:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.42 2010/03/06 06:25:51 jruoho Exp $
+.\" $NetBSD: acpi.4,v 1.43 2010/03/19 04:04:27 cnst Exp $
.\"
.\" Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -41,7 +41,6 @@
.Cd "acpilid* at acpi?"
.Cd "acpismbus* at acpi?"
.Cd "acpitz* at acpi?"
-.Cd "aiboost* at acpi?"
.Cd "aibs* at acpi?"
.Cd "asus* at acpi?"
.Cd "attimer* at acpi?"
@@ -200,8 +199,6 @@
.It acpitz
.Tn ACPI
thermal zones.
-.It aiboost
-ASUS AI Booster Hardware monitor.
.It aibs
ASUSTeK AI Booster ACPI ATK0110 voltage, temperature and fan sensor.
.It asus
@@ -394,7 +391,6 @@
.Xr acpilid 4 ,
.Xr acpismbus 4 ,
.Xr acpitz 4 ,
-.Xr aiboost 4 ,
.Xr aibs 4 ,
.Xr apm 4 ,
.Xr attimer 4 ,
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.249 src/sys/arch/i386/conf/ALL:1.250
--- src/sys/arch/i386/conf/ALL:1.249 Sat Mar 6 21:12:04 2010
+++ src/sys/arch/i386/conf/ALL Fri Mar 19 04:04:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.249 2010/03/06 21:12:04 plunky Exp $
+# $NetBSD: ALL,v 1.250 2010/03/19 04:04:27 cnst Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.249 $"
+#ident "ALL-$Revision: 1.250 $"
maxusers 64 # estimated number of users
@@ -374,7 +374,6 @@
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
-aiboost* at acpi? # ASUS AI Booster Hardware Monitor
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
asus* at acpi? # ASUS hotkeys
attimer* at acpi? # AT Timer
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.258 src/sys/dev/DEVNAMES:1.259
--- src/sys/dev/DEVNAMES:1.258 Thu Mar 11 10:38:37 2010
+++ src/sys/dev/DEVNAMES Fri Mar 19 04:04:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.258 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: DEVNAMES,v 1.259 2010/03/19 04:04:27 cnst Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -61,7 +61,6 @@
ahsc amiga
ahsc amigappc
ai MI
-aiboost MI
aibs MI
aic MI
akbd mac68k
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.67 src/sys/dev/acpi/files.acpi:1.68
--- src/sys/dev/acpi/files.acpi:1.67 Tue Feb 9 03:19:51 2010
+++ src/sys/dev/acpi/files.acpi Fri Mar 19 04:04:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.67 2010/02/09 03:19:51 cnst Exp $
+# $NetBSD: files.acpi,v 1.68 2010/03/19 04:04:28 cnst Exp $
include "dev/acpi/acpica/files.acpica"
@@ -109,11 +109,6 @@
attach hpet at acpinodebus with hpet_acpi
file dev/acpi/hpet_acpi.c hpet_acpi
-# ASUS AI Booster Hardware monitor
-device aiboost: sysmon_envsys
-attach aiboost at acpinodebus
-file dev/acpi/aiboost.c aiboost
-
# ASUS hotkey device
device asus: sysmon_envsys, sysmon_power
attach asus at acpinodebus
Index: src/usr.sbin/envstat/envstat.8
diff -u src/usr.sbin/envstat/envstat.8:1.55 src/usr.sbin/envstat/envstat.8:1.56
--- src/usr.sbin/envstat/envstat.8:1.55 Mon Feb 15 22:38:28 2010
+++ src/usr.sbin/envstat/envstat.8 Fri Mar 19 04:04:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: envstat.8,v 1.55 2010/02/15 22:38:28 pgoyette Exp $
+.\" $NetBSD: envstat.8,v 1.56 2010/03/19 04:04:28 cnst Exp $
.\"
.\" Copyright (c) 2000, 2007, 2008, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -177,7 +177,6 @@
.Xr acpibat 4 ,
.Xr acpitz 4 ,
.Xr admtemp 4 ,
-.Xr aiboost 4 ,
.Xr aibs 4 ,
.Xr amdtemp 4 ,
.Xr aps 4 ,
