diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2009-05-12 19:49:37 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2009-05-12 19:49:37 +0000 |
| commit | 6c6afe07bcd447a99a5584a2249557d45aff4b5f (patch) | |
| tree | a77912f65a950adce6de979b9e9c77aca7b21fb3 /sys/arch/i386 | |
| parent | 92db308cca1dc8968eaf6ae4fc41dd62b95a8931 (diff) | |
uld(4) works on i386, too. Disabled in GENERIC by default.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index e04f3a48d87..1e802a90da9 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.657 2009/05/07 11:30:26 ariane Exp $ +# $OpenBSD: GENERIC,v 1.658 2009/05/12 19:49:36 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -302,6 +302,9 @@ puc* at pci? # PCI "universal" communication device uvideo* at uhub? video* at uvideo? +#udl* at uhub? +#wsdisplay* at udl? + sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 9a32b6c71b0..354a4f0083c 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.189 2009/05/07 11:30:26 ariane Exp $ +# $OpenBSD: files.i386,v 1.190 2009/05/12 19:49:36 mglocker Exp $ # # new style config file for i386 architecture # @@ -52,6 +52,9 @@ file arch/i386/i386/db_mp.c multiprocessor & ddb file arch/i386/i386/wscons_machdep.c wsdisplay major {vnd = 14} +include "dev/rasops/files.rasops" +include "dev/wsfont/files.wsfont" + # # Media Independent Interface (mii) # |