summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/man/man4/Makefile2
-rw-r--r--sys/conf/NOTES5
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/options10
-rw-r--r--sys/i386/conf/LINT5
-rw-r--r--sys/i386/conf/NOTES5
-rw-r--r--sys/pci/pcisupport.c7
7 files changed, 25 insertions, 10 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 85ac84b..2e73013 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -3,7 +3,7 @@
MAN4= bpf.4 bridge.4 ccd.4 cd.4 ch.4 da.4 ddb.4 divert.4 drum.4 \
dummynet.4 fd.4 fpa.4 \
icmp.4 ifmib.4 iic.4 iicbb.4 iicbus.4 iicsmb.4 \
- inet.4 intro.4 ip.4 ipfirewall.4 \
+ inet.4 intpm.4 intro.4 ip.4 ipfirewall.4 \
lkm.4 lo.4 lpbb.4 natm.4 netintro.4 \
null.4 od.4 pass.4 plip.4 ppbus.4 ppi.4 ppp.4 pt.4 pty.4 \
route.4 sa.4 scsi.4 \
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 6709b1a..99019fe 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.544 1999/01/24 01:22:37 grog Exp $
+# $Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -1643,8 +1643,10 @@ options POWERFAIL_NMI # make it beep instead of panicing
# Supported interfaces:
# iicsmb I2C to SMB bridge with any iicbus interface
# bktr brooktree848 I2C hardware interface
+# intpm Intel PIIX4 Power Management Unit
#
controller smbus0
+controller intpm0
device smb0 at smbus?
@@ -1947,6 +1949,7 @@ options SI_DEBUG
options SIMPLELOCK_DEBUG
options SPX_HACK
options VFS_BIO_DEBUG
+options ENABLE_ALART
# The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
# These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
diff --git a/sys/conf/files b/sys/conf/files
index 573679f..35b1c1d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -601,6 +601,7 @@ pci/if_vx_pci.c optional vx device-driver
pci/if_wb.c optional wb device-driver
pci/if_xl.c optional xl device-driver
pci/isp_pci.c optional isp device-driver
+pci/intpm.c optional intpm device-driver
pci/meteor.c optional meteor device-driver
pci/ncr.c optional ncr device-driver
pci/pci.c optional pci device-driver
diff --git a/sys/conf/options b/sys/conf/options
index 7a7fad4..156cd4b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.123 1999/01/23 17:07:49 nsouch Exp $
+# $Id: options,v 1.124 1999/01/25 03:51:50 peter Exp $
#
# On the handling of kernel options
#
@@ -241,8 +241,6 @@ DPT_RESET_HBA opt_dpt.h
# with 'make CC="cc -DDEBUG'.
CLUSTERDEBUG opt_debug_cluster.h
DEBUG_1284 opt_ppb_1284.h
-PERIPH_1284 opt_ppb_1284.h
-DONTPROBE_1284 opt_ppb_1284.h
VP0_DEBUG opt_vpo.h
NLPT_DEBUG opt_nlpt.h
PLIP_DEBUG opt_plip.h
@@ -253,6 +251,12 @@ NETATALKDEBUG opt_atalk.h
NULLFS_DIAGNOSTIC opt_debug_nullfs.h
SI_DEBUG opt_debug_si.h
+# ppbus related options
+PERIPH_1284 opt_ppb_1284.h
+DONTPROBE_1284 opt_ppb_1284.h
+
+# smbus related options
+ENABLE_ALART opt_intpm.h
# These cause changes all over the kernel
DEBUG opt_global.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 6709b1a..99019fe 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.544 1999/01/24 01:22:37 grog Exp $
+# $Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -1643,8 +1643,10 @@ options POWERFAIL_NMI # make it beep instead of panicing
# Supported interfaces:
# iicsmb I2C to SMB bridge with any iicbus interface
# bktr brooktree848 I2C hardware interface
+# intpm Intel PIIX4 Power Management Unit
#
controller smbus0
+controller intpm0
device smb0 at smbus?
@@ -1947,6 +1949,7 @@ options SI_DEBUG
options SIMPLELOCK_DEBUG
options SPX_HACK
options VFS_BIO_DEBUG
+options ENABLE_ALART
# The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
# These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 6709b1a..99019fe 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.544 1999/01/24 01:22:37 grog Exp $
+# $Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -1643,8 +1643,10 @@ options POWERFAIL_NMI # make it beep instead of panicing
# Supported interfaces:
# iicsmb I2C to SMB bridge with any iicbus interface
# bktr brooktree848 I2C hardware interface
+# intpm Intel PIIX4 Power Management Unit
#
controller smbus0
+controller intpm0
device smb0 at smbus?
@@ -1947,6 +1949,7 @@ options SI_DEBUG
options SIMPLELOCK_DEBUG
options SPX_HACK
options VFS_BIO_DEBUG
+options ENABLE_ALART
# The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
# These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index b502bbf..114e4b4 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcisupport.c,v 1.85 1998/12/23 14:28:37 foxfair Exp $
+** $Id: pcisupport.c,v 1.86 1998/12/27 07:59:25 foxfair Exp $
**
** Device driver for DEC/INTEL PCI chipsets.
**
@@ -273,7 +273,7 @@ chipset_probe (pcici_t tag, pcidi_t type)
case 0x71108086:
return ("Intel 82371AB PCI to ISA bridge");
case 0x71138086:
- return ("Intel 82371AB Power management controller");
+ return NULL;
case 0x71908086:
return ("Intel 82443BX host to PCI bridge");
case 0x71918086:
@@ -362,7 +362,8 @@ chipset_probe (pcici_t tag, pcidi_t type)
return("AcerLabs M5247 PCI-PCI(AGP Supported) bridge");
case 0x524310b9:/* 5243 seems like 5247, need more info to divide*/
return("AcerLabs M5243 PCI-PCI bridge");
-
+ case 0x710110b9:
+ return("AcerLabs M15x3 Power Management Unit");
/* NEC -- vendor 0x1033 */
case 0x00011033:
OpenPOWER on IntegriCloud