buildkernel: Disable building of acpi_hp.ko. It will not load.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 948e11e..4a7a146 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1805,3 +1805,8 @@ TO_REMOVE+=/usr/share/man/man4/rum.4.gz
 TO_REMOVE+=/boot/modules/if_ural.ko
 TO_REMOVE+=/usr/share/man/cat4/ural.4.gz
 TO_REMOVE+=/usr/share/man/man4/ural.4.gz
+
+# XXX Remove when acpi_hp(4) has been fixed
+TO_REMOVE+=/boot/kernel/acpi_hp.ko
+TO_REMOVE+=/usr/share/man/cat4/acpi_hp.4.gz
+TO_REMOVE+=/usr/share/man/man4/acpi_hp.4.gz

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index d52b317..50dd4e6 100644 (file)
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -5,7 +5,6 @@ MAN=    aac.4 \
        acpi.4 \
        acpi_asus.4 \
        acpi_fujitsu.4 \
-       acpi_hp.4 \
        acpi_panasonic.4 \
        acpi_sony.4 \
        acpi_thermal.4 \
@@ -377,6 +376,9 @@ MAN=        aac.4 \
 #      rum.4 \
 #      ural.4 \
 
+# XXX re-add when acpi_hp(4) has been fixed
+#      acpi_hp.4 \
+
 MLINKS=        acpi_thermal.4 acpi_tz.4
 MLINKS+=agp.4 agpgart.4
 MLINKS+=bktr.4 brooktree.4

diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index c18f677..77d1249 100644 (file)
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -580,7 +580,7 @@ ACPI is only found and supported on i386/ia32, ia64, and x86_64.
 .Xr kenv 1 ,
 .Xr acpi_asus 4 ,
 .Xr acpi_fujitsu 4 ,
-.Xr acpi_hp 4 ,
+.\".Xr acpi_hp 4 ,
 .Xr acpi_panasonic 4 ,
 .Xr acpi_sony 4 ,
 .Xr acpi_thermal 4 ,

diff --git a/sys/dev/acpica5/Makefile b/sys/dev/acpica5/Makefile
index 16c4e99..8b6ce7c 100644 (file)
--- a/sys/dev/acpica5/Makefile
+++ b/sys/dev/acpica5/Makefile
@@ -113,6 +113,7 @@ acpi_wakecode.h: acpi_wakecode.S
        ${MAKE} -f ${SYSDIR}/${OSACPI_MD_DIR}/Makefile \
                MAKESRCPATH=${SYSDIR}/${OSACPI_MD_DIR}
 
-SUBDIR=        acpi_asus acpi_fujitsu acpi_hp acpi_panasonic acpi_sony acpi_thinkpad acpi_toshiba acpi_video aibs
+SUBDIR=        acpi_asus acpi_fujitsu acpi_panasonic acpi_sony acpi_thinkpad acpi_toshiba acpi_video aibs
+#SUBDIR+=acpi_hp
 
 .include <bsd.kmod.mk>