summaryrefslogtreecommitdiff
path: root/sys/arch/zaurus/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-16 18:12:47 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-16 18:12:47 +0000
commita8d8321685dfd4ff0aefa3b511848cbe631d8bfa (patch)
treed039e32b3c6eb920c4f404311534c9534c8ac061 /sys/arch/zaurus/conf
parent140f494a9d702e30ddb29aff133b40ea436a5607 (diff)
WSEMUL_VT100 is the default
Diffstat (limited to 'sys/arch/zaurus/conf')
-rw-r--r--sys/arch/zaurus/conf/GENERIC3
-rw-r--r--sys/arch/zaurus/conf/RAMDISK9
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index ab65fbb753a..9c1ec775c4f 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 2005/01/14 18:18:19 drahn Exp $
+# $OpenBSD: GENERIC,v 1.16 2005/01/16 18:12:46 deraadt Exp $
#
# GENERIC machine description file
#
@@ -167,7 +167,6 @@ ukphy* at mii? # "unknown" PHYs
# LCD
lcd0 at pxaip?
wsdisplay* at lcd? console ?
-options WSEMUL_VT100 # VT100 / VT220 emulation
# Pseudo-Devices
pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 056ce4db909..dc340bf337e 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,5 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.13 2005/01/14 18:18:19 drahn Exp $
-# $NetBSD: GENERIC,v 1.27.4.1 2002/08/01 04:18:06 lukem Exp $
+# $OpenBSD: RAMDISK,v 1.14 2005/01/16 18:12:46 deraadt Exp $
#
# GENERIC machine description file
#
@@ -21,11 +20,9 @@
machine zaurus arm
-# include "../../../conf/GENERIC"
options TIMEZONE=0 # time zone to adjust RTC time by
options DST=0 # daylight saving time used by RTC
options FFS # UFS
-#options NFSCLIENT # Network File System client
options CD9660 # ISO 9660 + Rock Ridge file system
options MSDOSFS # MS-DOS file system
options INET # IP + ICMP + TCP + UDP
@@ -131,7 +128,7 @@ ne* at pcmcia?
wdc* at pcmcia?
# IDE hard drives
-wd* at wdc? flags 0x0000
+wd* at wdc? flags 0x0000
# PHY
exphy* at mii? # 3Com internal PHYs
@@ -159,11 +156,9 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
#ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
ukphy* at mii? # "unknown" PHYs
-
# LCD
lcd0 at pxaip?
wsdisplay* at lcd? console ?
-options WSEMUL_VT100 # VT100 / VT220 emulation
# Pseudo-Devices
pseudo-device wsmux 2 # mouse & keyboard multiplexor