Stop making de win over dc on alpha, and include both dc and de on all

installation media now - it fits.

THIS MEANS YOU NEED TO RENAME /etc/hostname.de0 TO /etc/hostname.dc0
BEFORE BOOTING A NEW KERNEL.

ok deraadt@

3 files changed, 24 insertions, 23 deletions

diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 6e77cb34f04..b30acf86b8f 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.66 2007/03/18 22:39:30 martin Exp $
+#	$OpenBSD: RAMDISK,v 1.67 2007/08/01 16:30:00 miod Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -75,7 +75,7 @@ pci*	at mcpcia?
 # PCI devices
 #ahc*	at pci?				# AHA-28xx SCSI (NOT 64-BIT)
 de*	at pci?				# 21x4[012]-based Ethernet
-#dc*	at pci?				# 21143, "tulip" clone ethernet
+dc*	at pci?				# 21143, "tulip" clone ethernet
 fxp*	at pci?				# EtherExpress 10/100B ethernet cards
 #ne*	at pci?				# NE2000-compat ethernet cards
 #en*	at pci?				# ENI PCI ATM (untested)
@@ -97,14 +97,19 @@ isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
 #option ISP_COMPILE_12160_FW=1
 
 # Media Independent Interface (mii) drivers
+amphy*	at mii?				# AMD 79C873 PHYs
+bmtphy*	at mii?				# Broadcom 10/100 PHYs
+dcphy*	at mii?				# Digital Clone PHYs
 #exphy*	at mii?				# 3Com internal PHYs
 #inphy*	at mii?				# Intel 82555 PHYs
 #icsphy* at mii?			# ICS 1890 PHYs
-#lxtphy* at mii?			# Level1 LXT970 PHYs
-#nsphy*	at mii?				# NS and compatible PHYs
+lxtphy* at mii?				# Level1 LXT970 PHYs
+mtdphy* at mii?				# Myson MTD972 PHYs
+nsphy*	at mii?				# NS and compatible PHYs
+nsphyter* at mii?			# NS and compatible PHYs
 #qsphy*	at mii?				# Quality Semi QS6612 PHYs
-#sqphy*	at mii?				# Seeq 8x220 PHYs
-#mtdphy* at mii?			# Myson MTD972 PHYs
+sqphy*	at mii?				# Seeq 8x220 PHYs
+tqphy*	at mii?				# TDK 78Q212x PHYs
 ukphy*	at mii?				# "unknown" PHYs
 
 # ISA/EISA bus support
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 68fb9c52404..0029165b289 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.30 2006/03/12 17:29:48 martin Exp $
+#	$OpenBSD: RAMDISKB,v 1.31 2007/08/01 16:30:00 miod Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -68,7 +68,7 @@ pci*	at ppb?
 # PCI devices
 ahc*	at pci?				# AHA-28xx SCSI (NOT 64-BIT)
 de*	at pci?				# 21x4[012]-based Ethernet
-#dc*	at pci?				# 21143, "tulip" clone ethernet
+dc*	at pci?				# 21143, "tulip" clone ethernet
 fxp*	at pci?				# EtherExpress 10/100B ethernet cards
 #ne*	at pci?				# NE2000-compat ethernet cards
 #en*	at pci?				# ENI PCI ATM (untested)
@@ -89,14 +89,19 @@ isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
 #option ISP_COMPILE_12160_FW=1
 
 # Media Independent Interface (mii) drivers
+amphy*	at mii?				# AMD 79C873 PHYs
+bmtphy*	at mii?				# Broadcom 10/100 PHYs
+dcphy*	at mii?				# Digital Clone PHYs
 #exphy*	at mii?				# 3Com internal PHYs
 #inphy*	at mii?				# Intel 82555 PHYs
-#icsphy*	at mii?			# ICS 1890 PHYs
-#lxtphy*	at mii?			# Level1 LXT970 PHYs
-#nsphy*	at mii?				# NS and compatible PHYs
+#icsphy* at mii?			# ICS 1890 PHYs
+lxtphy* at mii?				# Level1 LXT970 PHYs
+mtdphy* at mii?				# Myson MTD972 PHYs
+nsphy*	at mii?				# NS and compatible PHYs
+nsphyter* at mii?			# NS and compatible PHYs
 #qsphy*	at mii?				# Quality Semi QS6612 PHYs
-#sqphy*	at mii?				# Seeq 8x220 PHYs
-#mtdphy*	at mii?			# Myson MTD972 PHYs
+sqphy*	at mii?				# Seeq 8x220 PHYs
+tqphy*	at mii?				# TDK 78Q212x PHYs
 ukphy*	at mii?				# "unknown" PHYs
 
 # ISA/EISA bus support
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index c3ede442b65..8c574051141 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_pci.c,v 1.57 2007/04/10 17:47:55 miod Exp $	*/
+/*	$OpenBSD: if_dc_pci.c,v 1.58 2007/08/01 16:30:03 miod Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -145,19 +145,10 @@ dc_pci_match(parent, match, aux)
 	    PCI_REVISION(pa->pa_class) == 0x21)
 		return (1);
 
-	/*
-	 * Since dc doesn't fit on the alpha floppy, we want de to win by
-	 * default on alpha so that RAMDISK* and GENERIC will use the same
-	 * driver.
-	 */
 	for (t = dc_devs; t->dc_vid != 0; t++) {
 		if ((PCI_VENDOR(pa->pa_id) == t->dc_vid) &&
 		    (PCI_PRODUCT(pa->pa_id) == t->dc_did)) {
-#ifdef __alpha__
-			return (1);
-#else
 			return (3);
-#endif
 		}
 	}