shovel ttye to md; ok miod@

3 files changed, 11 insertions, 9 deletions

diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi
index 67abb856fb2..076c305be73 100644
--- a/etc/MAKEDEV.mi
+++ b/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.65 2004/01/12 22:31:34 todd Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.66 2004/01/13 15:13:14 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -156,8 +156,6 @@ twrget(all, tzs, tty, a, b, c, d)dnl
 twrget(all, czs, cua, a, b, c, d)dnl
 target(all, ttyc, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 twrget(all, com, tty0, 0, 1, 2, 3)dnl
-twrget(all, mac_ttye, ttye, 0)dnl
-target(all, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
 target(all, lkm)dnl
 twrget(all, mmcl, mmclock)dnl
 target(all, lpt, 0, 1, 2)dnl
@@ -375,8 +373,6 @@ dnl
 __devtitle(cons, Console ports)dnl
 __devitem(ttyv0, ttyv0, pccons or pcvt screen 0)dnl
 __devitem(ttyv, ttyv*, pcvt)dnl
-__devitem(ttye, ttye*, ite bitmapped consoles)dnl
-__devitem(mac_ttye, ttye*, ite bitmapped consoles)dnl
 __devitem(wscons, ttyC0, wscons screen 0)dnl
 twrget(wscons, wscons, ttyC, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
 target(wscons, wsmux)dnl
diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md
index 4b293d3444e..85a90e3272a 100644
--- a/etc/etc.hp300/MAKEDEV.md
+++ b/etc/etc.hp300/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.13 2003/06/18 18:08:59 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.14 2004/01/13 15:13:14 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001,2002,2003 Todd T. Fries <todd@OpenBSD.org>
@@ -42,6 +42,7 @@ _mkdev(st_hp300, ct*|mt*|st*,
 	esac-})dnl
 __devitem(st_hp300, st*, Exabyte tape)dnl
 __devitem(grf, grf*, raw interface to HP300 graphics devices)dnl
+__devitem(ttye, ttye*, ite bitmapped consoles)dnl
 dnl
 dnl
 _TITLE(make)
@@ -209,6 +210,7 @@ target( all, dcm, 0, 1, 2, 3)dnl
 target( all, hd, 0, 1, 2)dnl
 target( all, ct, 0, 1)dnl
 target( all, ite, 0)dnl
+target( all, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
 target(ramd, ct, 0, 1)dnl
 target(ramd, hd, 0, 1, 2)dnl
 target(ramd, sd, 0, 1, 2)dnl
diff --git a/etc/etc.mac68k/MAKEDEV.md b/etc/etc.mac68k/MAKEDEV.md
index 7bb676fcbfa..734ad4874a5 100644
--- a/etc/etc.mac68k/MAKEDEV.md
+++ b/etc/etc.mac68k/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.11 2003/06/18 18:08:59 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.12 2004/01/13 15:13:14 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001,2002,2003 Todd T. Fries <todd@OpenBSD.org>
@@ -17,6 +17,10 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl
+dnl *** mac68k specific defintions
+dnl
+__devitem(ttye, ttye*, ite bitmapped consoles)dnl
+dnl
 _TITLE(make)
 _DEV(all)
 _DEV(std)
@@ -31,7 +35,7 @@ _DEV(ch, 17)
 _DEV(vnd, 19, 8)
 _DEV(ccd, 20, 9)
 _TITLE(term)
-_DEV(mac_ttye)
+_DEV(ttye)
 _DEV(mac_tty0)
 _TITLE(pty)
 _DEV(tty, 4)
@@ -114,12 +118,12 @@ target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, ccd, 0, 1, 2, 3)dnl
+twrget(all, ttye, ttye, 0)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, rd, 0, 1)dnl
 target(ramd, adb)dnl
 target(ramd, asc, 0)dnl
 target(ramd, grf, 0, 1)dnl
-target(ramd, ttye, 0)dnl
 twrget(ramd, mac_tty0, tty0, 0, 1)dnl
 target(ramd, pty, 0)dnl