diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-08-14 21:50:50 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-08-14 21:50:50 +0000 |
commit | 68a08cd3daa393fda25f32dfe2deba40e312691a (patch) | |
tree | 55fa28431fee7ffda402e87bc77367ea60565e52 /sys/dev/pci/files.pci | |
parent | b89c8a0d48c60ed6bf4440b7b3e217d8df068f42 (diff) |
Kill the musyccbus/ebus device and use musycc for both functions of the
chip. Using two different devices for one card was a stupid idea.
OK deraadt@
Diffstat (limited to 'sys/dev/pci/files.pci')
-rw-r--r-- | sys/dev/pci/files.pci | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index 5501fa17464..e8e592433f0 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.186 2005/08/14 07:30:00 deraadt Exp $ +# $OpenBSD: files.pci,v 1.187 2005/08/14 21:50:49 claudio Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -545,16 +545,14 @@ device ichwdt {} attach ichwdt at pci file dev/pci/ichwdt.c ichwdt -# Mindspeed/Conexant MUSYCC HDLC controller and EBUS bridge +# Mindspeed/Conexant MUSYCC HDLC controller device musycc {} : ifnet attach musycc at pci -device musyccbus {} : musycc -attach musyccbus at pci -file dev/pci/musycc.c musycc | musyccbus -file dev/pci/musycc_obsd.c musycc | musyccbus +file dev/pci/musycc.c musycc +file dev/pci/musycc_obsd.c musycc # Accoom Artery PCI card -device art: musycc, musyccbus, ifnet, ifmedia, sppp +device art: musycc, ifnet, ifmedia, sppp attach art at musycc file dev/pci/if_art.c art file dev/pci/bt8370.c art |