From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Fri, 25 Aug 2006 22:37:09 +0000 (+0000)
Subject: Remove more DEC Alpha support.
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/20df2adcccf07bb71a4c5e43b4f19635d0e56d22

Remove more DEC Alpha support.
---

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 6c81e80eed..e702fbdbf6 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -21,7 +21,7 @@
 #
 #	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
 # $FreeBSD: src/etc/MAKEDEV,v 1.243.2.57 2003/02/10 11:35:53 simokawa Exp $
-# $DragonFly: src/etc/MAKEDEV,v 1.21 2006/08/19 01:36:39 swildner Exp $
+# $DragonFly: src/etc/MAKEDEV,v 1.22 2006/08/25 22:37:08 swildner Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, standard number of units (or close)
@@ -493,7 +493,6 @@ all)
 	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
 	sh MAKEDEV pty0					# cdev, pseudo tty
 	sh MAKEDEV ttyd0 ttyd1 ttyd2 ttyd3		# cdev, serial tty
-	sh MAKEDEV zs0					# big-Alpha serial tty
 	sh MAKEDEV kbd0 kbd1				# cdev, keyboard
 	sh MAKEDEV mse0 psm0 jogdial sysmouse		# cdev, mouse
 	sh MAKEDEV pcaudio speaker snd0			# cdev, noise
@@ -544,7 +543,6 @@ fixit)
 	sh MAKEDEV cuaa0				# cdev, serial tty
 	sh MAKEDEV pty0					# cdev, pseudo tty
 	sh MAKEDEV ttyd0				# cdev, serial tty
-	sh MAKEDEV zs0					# big-Alpha serial tty
 	sh MAKEDEV kbd0					# cdev, keyboard
 	sh MAKEDEV mse0 psm0 sysmouse			# cdev, mouse
 	sh MAKEDEV lpt0					# cdev, printer
@@ -1580,16 +1578,6 @@ cuaA*)
 
 #-----------------------------------------------------------------------------
 
-zs?)
-	unit=`expr $i : 'zs.*\(.\)$'`
-
-	m=`ttyminor $unit`
-
-	mknod zs $unit c 135 $m
-	;;
-
-#-----------------------------------------------------------------------------
-
 ttyD?)
 	portlist="0 1 2 3 4 5 6 7 8 9 a b c d e f"
 	major=58
diff --git a/etc/Makefile b/etc/Makefile
index fcebe9b4f7..5bc9fa20cf 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,6 +1,6 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.125 2006/08/18 08:22:43 swildner Exp $
+# $DragonFly: src/etc/Makefile,v 1.126 2006/08/25 22:37:08 swildner Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -434,6 +434,7 @@ upgrade_etc:	preupgrade
 	rm -f ${DESTDIR}/sbin/brconfig
 	rm -f ${DESTDIR}/usr/share/mk/bsd.cpu.gcc[23].mk
 	rm -f ${DESTDIR}/modules/coda.ko
+	rm -f ${DESTDIR}/dev/zs0
 	ldconfig -R
 .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes
 .if !defined(NO_MAKEDEV)
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 24b26486fc..6f910bb090 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -14,7 +14,7 @@
 # All arguments must be in double or single quotes.
 #
 # $FreeBSD: src/etc/defaults/rc.conf,v 1.180 2003/06/26 09:50:50 smkelly Exp $
-# $DragonFly: src/etc/defaults/rc.conf,v 1.31 2006/05/20 18:26:24 dillon Exp $
+# $DragonFly: src/etc/defaults/rc.conf,v 1.32 2006/08/25 22:37:08 swildner Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -407,7 +407,6 @@ check_quotas="YES"	# Check quotas on startup (or NO).
 accounting_enable="NO"	# Turn on process accounting (or NO).
 sysvipc_enable="NO"	# Load System V IPC primitives at startup (or NO).
 linux_enable="NO"	# Linux binary compatibility loaded at startup (or NO).
-osf1_enable="NO"	# Alpha OSF/1 emulation loaded at startup (or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
 ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib"
diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index 017f72af6c..95cec20620 100644
--- a/etc/rc.d/archdep
+++ b/etc/rc.d/archdep
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $
-# $DragonFly: src/etc/rc.d/Attic/archdep,v 1.5 2006/05/20 18:26:29 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/archdep,v 1.6 2006/08/25 22:37:08 swildner Exp $
 #
 
 # PROVIDE: archdep
@@ -22,27 +22,11 @@ unaligned_warnings()
 	fi
 }
 
-# Alpha OSF/1 binary emulation
-#
-osf1_compat()
-{
-	if checkyesno osf1_enable; then
-		echo -n ' OSF/1'
-		if ! kldstat -v | grep osf1_ecoff > /dev/null; then
-			kldload osf1 > /dev/null 2>&1
-		fi
-	fi
-}
-
 _arch=`${SYSCTL_N} hw.machine`
 echo -n "Initial $_arch initialization:"
 case $_arch in
 i386)
 	;;
-alpha)
-	osf1_compat
-	unaligned_warnings
-	;;
 ia64)
 	unaligned_warnings
 	;;
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 475041ecfd..12d94d928f 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.22 2003/04/17 17:56:34 trhodes Exp $
-.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.9 2006/05/26 19:39:38 swildner Exp $
+.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.10 2006/08/25 22:37:08 swildner Exp $
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
@@ -444,8 +444,7 @@ Otherwise, the default boot image names are used:
 .Pa /boot/boot1
 and
 .Pa /boot/boot2
-for the standard stage1 and stage2 boot images (details may vary
-on architectures like the Alpha, where only a single-stage boot is used).
+for the standard stage1 and stage2 boot images.
 .El
 .Ss Initializing/Formatting a bootable disk from scratch
 To initialize a disk from scratch the following sequence is recommended.
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index ebc561d6dd..cad6ed4e91 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/dc.4,v 1.6.2.9 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/dc.4,v 1.3 2004/03/11 12:28:55 hmp Exp $
+.\" $DragonFly: src/share/man/man4/dc.4,v 1.4 2006/08/25 22:37:08 swildner Exp $
 .\"
 .Dd November 20, 1999
 .Dt DC 4
@@ -104,8 +104,6 @@ driver at this time:
 .It
 Digital DE500-BA 10/100 (21143, non-MII)
 .It
-Built in DE500-BA on DEC Alpha workstations (21143, non-MII)
-.It
 Built in 10Mbps only ethernet on Compaq Presario 7900 series
 desktops (21143, non-MII)
 .It
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index cd573f023f..a97d185ea1 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.197 2003/07/28 13:56:00 mbr Exp $
-.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.23 2006/07/23 07:47:12 swildner Exp $
+.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.24 2006/08/25 22:37:08 swildner Exp $
 .Dd March 3, 2002
 .Dt RC.CONF 5
 .Os
@@ -2196,13 +2196,6 @@ Set to
 .Dq Li YES
 to enable Linux/ELF binary emulation at system initial
 boot time.
-.It Va osf1_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-to enable OSF/1 (Digital UNIX) binary emulation at system
-initial boot time.
-(alpha)
 .It Va sysvipc_enable
 .Pq Vt bool
 If set to
diff --git a/share/mk/bsd.cpu.gcc34.mk b/share/mk/bsd.cpu.gcc34.mk
index 1c53a6d58d..efab3b0bb6 100644
--- a/share/mk/bsd.cpu.gcc34.mk
+++ b/share/mk/bsd.cpu.gcc34.mk
@@ -1,4 +1,4 @@
-# $DragonFly: src/share/mk/bsd.cpu.gcc34.mk,v 1.1 2004/06/15 07:53:32 joerg Exp $
+# $DragonFly: src/share/mk/bsd.cpu.gcc34.mk,v 1.2 2006/08/25 22:37:08 swildner Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
@@ -8,9 +8,6 @@
 . if ${MACHINE_ARCH} == "i386"
 _CPUCFLAGS = -mtune=pentiumpro
 MACHINE_CPU = i486
-. elif ${MACHINE_ARCH} == "alpha"
-_CPUCFLAGS = -mtune=ev4 -mtune=ev5
-MACHINE_CPU = ev4
 .elif ${MACHINE_ARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse
 . elif ${MACHINE_ARCH} == "ia64"
@@ -38,7 +35,6 @@ CPUTYPE = athlon
 # after /etc/make.conf so it can react to the local value of CPUTYPE
 # defined therein.  Consult:
 #	http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html
-#	http://gcc.gnu.org/onlinedocs/gcc/DEC-Alpha-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html
 
@@ -66,22 +62,6 @@ _CPUCFLAGS = -march=pentium
 .  elif ${CPUTYPE} == "i486"
 _CPUCFLAGS = -march=i486
 .  endif
-. elif ${MACHINE_ARCH} == "alpha"
-.  if ${CPUTYPE} == "ev67"
-_CPUCFLAGS = -mtune=ev67
-.  elif ${CPUTYPE} == "ev6"
-_CPUCFLAGS = -mtune=ev6
-.  elif ${CPUTYPE} == "pca56"
-_CPUCFLAGS = -mtune=pca56
-.  elif ${CPUTYPE} == "ev56"
-_CPUCFLAGS = -mtune=ev56
-.  elif ${CPUTYPE} == "ev5"
-_CPUCFLAGS = -mtune=ev5
-.  elif ${CPUTYPE} == "ev45"
-_CPUCFLAGS = -mtune=ev45
-.  elif ${CPUTYPE} == "ev4"
-_CPUCFLAGS = -mtune=ev4
-.  endif
 . endif
 
 # Set up the list of CPU features based on the CPU type.  This is an
@@ -118,20 +98,6 @@ MACHINE_CPU = i486 i386
 .  elif ${CPUTYPE} == "i386"
 MACHINE_CPU = i386
 .  endif
-. elif ${MACHINE_ARCH} == "alpha"
-.  if ${CPUTYPE} == "ev6"
-MACHINE_CPU = ev6 ev56 pca56 ev5 ev45 ev4
-.  elif ${CPUTYPE} == "pca56"
-MACHINE_CPU = pca56 ev56 ev5 ev45 ev4
-.  elif ${CPUTYPE} == "ev56"
-MACHINE_CPU = ev56 ev5 ev45 ev4
-.  elif ${CPUTYPE} == "ev5"
-MACHINE_CPU = ev5 ev45 ev4
-.  elif ${CPUTYPE} == "ev45"
-MACHINE_CPU = ev45 ev4
-.  elif ${CPUTYPE} == "ev4"
-MACHINE_CPU = ev4
-.  endif
 . elif ${MACHINE_ARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse
 . elif ${MACHINE_ARCH} == "ia64"
@@ -140,8 +106,3 @@ MACHINE_CPU = itanium
 .  endif
 . endif
 .endif
-
-.if ${MACHINE_ARCH} == "alpha"
-_CPUCFLAGS += -mieee
-.endif
-
diff --git a/share/mk/bsd.cpu.gcc40.mk b/share/mk/bsd.cpu.gcc40.mk
index b65f2acadf..1960f87ead 100644
--- a/share/mk/bsd.cpu.gcc40.mk
+++ b/share/mk/bsd.cpu.gcc40.mk
@@ -1,4 +1,4 @@
-# $DragonFly: src/share/mk/Attic/bsd.cpu.gcc40.mk,v 1.1 2005/06/05 22:43:19 corecode Exp $
+# $DragonFly: src/share/mk/Attic/bsd.cpu.gcc40.mk,v 1.2 2006/08/25 22:37:08 swildner Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
@@ -30,7 +30,6 @@ CPUTYPE = athlon
 # after /etc/make.conf so it can react to the local value of CPUTYPE
 # defined therein.  Consult:
 #	http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html
-#	http://gcc.gnu.org/onlinedocs/gcc/DEC-Alpha-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html
 
diff --git a/sys/Makefile b/sys/Makefile
index c5845ff9f0..ab8602a9e4 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/Makefile,v 1.20.2.1 2000/07/10 08:22:34 obrien Exp $
-# $DragonFly: src/sys/Makefile,v 1.12 2006/05/22 06:26:29 swildner Exp $
+# $DragonFly: src/sys/Makefile,v 1.13 2006/08/25 22:37:08 swildner Exp $
 
 # This is the old aout only boot loader.
 .if	exists(${.CURDIR}/${MACHINE_ARCH}/boot) && ${OBJFORMAT} == "aout"
@@ -8,10 +8,6 @@ SUBDIR=	${MACHINE_ARCH}/boot
 SUBDIR=	boot
 .endif
 
-.if	exists(${.CURDIR}/boot) && ${MACHINE_ARCH} == "alpha"
-SUBDIR= boot
-.endif
-
 # KLD modules build for both a.out and ELF
 #
 .if defined(MODULES_WITH_WORLD)
diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index de0f3793be..a78336cd99 100644
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/pci.c,v 1.141.2.15 2002/04/30 17:48:18 tmm Exp $
- * $DragonFly: src/sys/bus/pci/pci.c,v 1.30 2006/07/28 02:17:34 dillon Exp $
+ * $DragonFly: src/sys/bus/pci/pci.c,v 1.31 2006/08/25 22:37:08 swildner Exp $
  *
  */
 
@@ -53,7 +53,6 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/md_var.h>		/* For the Alpha */
 #include <machine/smp.h>
 #ifdef __i386__
 #include <bus/pci/i386/pci_cfgreg.h>
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index 6caaba8d36..ca90aef39b 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -24,93 +24,13 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.5.2.5 2002/04/22 15:49:30 cg Exp $
- * $DragonFly: src/sys/dev/sound/isa/Attic/es1888.c,v 1.4 2005/10/30 04:41:15 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/Attic/es1888.c,v 1.5 2006/08/25 22:37:08 swildner Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
 #include <dev/sound/isa/sb.h>
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/Attic/es1888.c,v 1.4 2005/10/30 04:41:15 dillon Exp $");
-
-#ifdef __alpha__
-static int
-es1888_dspready(u_int32_t port)
-{
-	return ((inb(port + SBDSP_STATUS) & 0x80) == 0);
-}
-
-static int
-es1888_dspwr(u_int32_t port, u_char val)
-{
-    	int  i;
-
-    	for (i = 0; i < 1000; i++) {
-		if (es1888_dspready(port)) {
-	    		outb(port + SBDSP_CMD, val);
-	    		return 0;
-		}
-		if (i > 10) DELAY((i > 100)? 1000 : 10);
-    	}
-    	return ENXIO;
-}
-
-static u_int
-es1888_get_byte(u_int32_t port)
-{
-    	int i;
-
-    	for (i = 1000; i > 0; i--) {
-		if (inb(port + DSP_DATA_AVAIL) & 0x80)
-			return inb(port + DSP_READ);
-		else
-			DELAY(20);
-    	}
-    	return 0xffff;
-}
-
-static int
-es1888_reset(u_int32_t port)
-{
-    	outb(port + SBDSP_RST, 3);
-    	DELAY(100);
-    	outb(port + SBDSP_RST, 0);
-    	if (es1888_get_byte(port) != 0xAA) {
-		return ENXIO;	/* Sorry */
-    	}
-    	return 0;
-}
-
-static void
-es1888_configuration_mode(void)
-{
-	/*
-	 * Emit the Read-Sequence-Key to enter configuration
-	 * mode. Note this only works after a reset (or after bit 2 of
-	 * mixer register 0x40 is set).
-	 *
-	 * 3 reads from 0x229 in a row guarantees reset of key
-	 * sequence to beginning.
-	 */
-	inb(0x229);
-	inb(0x229);
-	inb(0x229);
-
-	inb(0x22b);		/* state 1 */
-	inb(0x229);		/* state 2 */
-	inb(0x22b);		/* state 3 */
-	inb(0x229);		/* state 4 */
-	inb(0x229);		/* state 5 */
-	inb(0x22b);		/* state 6 */
-	inb(0x229);		/* state 7 */
-}
-
-static void
-es1888_set_port(u_int32_t port)
-{
-	es1888_configuration_mode();
-	inb(port);
-}
-#endif
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/Attic/es1888.c,v 1.5 2006/08/25 22:37:08 swildner Exp $");
 
 static int
 es1888_identify(driver_t *driver, device_t parent)
@@ -121,50 +41,7 @@ es1888_identify(driver_t *driver, device_t parent)
 	if (device_get_state(parent) == DS_ATTACHED)
 		return (0);
 
-	/*
-	 * Only use this on alpha since PNPBIOS is a better solution on x86.
-	 */
-#ifdef __alpha__
-	u_int32_t lo, hi;
-	device_t dev;
-
-	es1888_set_port(0x220);
-	if (es1888_reset(0x220))
-		return;
-
-	/*
-	 * Check identification bytes for es1888.
-	 */
-	if (es1888_dspwr(0x220, 0xe7))
-		return (ENXIO);
-	hi = es1888_get_byte(0x220);
-	lo = es1888_get_byte(0x220);
-	if (hi != 0x68 || (lo & 0xf0) != 0x80)
-		return (ENXIO);
-
-	/*
-	 * Program irq and drq.
-	 */
-	if (es1888_dspwr(0x220, 0xc6) /* enter extended mode */
-	    || es1888_dspwr(0x220, 0xb1) /* write register b1 */
-	    || es1888_dspwr(0x220, 0x14) /* enable irq 5 */
-	    || es1888_dspwr(0x220, 0xb2) /* write register b1 */
-	    || es1888_dspwr(0x220, 0x18)) /* enable drq 1 */
-		return (ENXIO);
-
-	/*
-	 * Create the device and program its resources.
-	 */
-	dev = BUS_ADD_CHILD(parent, parent, ISA_ORDER_PNP, NULL, -1);
-	bus_set_resource(dev, SYS_RES_IOPORT, 0, 0x220, 0x10);
-	bus_set_resource(dev, SYS_RES_IRQ, 0, 5, 1);
-	bus_set_resource(dev, SYS_RES_DRQ, 0, 1, 1);
-	isa_set_vendorid(dev, PNP_EISAID("ESS1888"));
-	isa_set_logicalid(dev, PNP_EISAID("ESS1888"));
-	return (0);
-#else
 	return (ENXIO);
-#endif
 }
 
 static device_method_t es1888_methods[] = {
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index db14235bad..fe6edd5ce9 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.5.2.6 2002/04/22 15:49:30 cg Exp $
- * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.7 2006/08/25 22:37:08 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -44,11 +44,8 @@
 
 #include <bus/isa/isavar.h>
 #include <bus/isa/isa_common.h>
-#ifdef __alpha__		/* XXX workaround a stupid warning */
-#include <alpha/isa/isavar.h>
-#endif
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.6 2005/10/12 17:35:55 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.7 2006/08/25 22:37:08 swildner Exp $");
 
 #define LOGICALID_NOPNP 0
 #define LOGICALID_PCM   0x0000561e
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 0801202fd9..e4856487be 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -38,12 +38,12 @@
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
  * $FreeBSD: src/sys/net/bpf_filter.c,v 1.17 1999/12/29 04:38:31 peter Exp $
- * $DragonFly: src/sys/net/bpf_filter.c,v 1.7 2005/04/20 16:05:51 cpressey Exp $
+ * $DragonFly: src/sys/net/bpf_filter.c,v 1.8 2006/08/25 22:37:08 swildner Exp $
  */
 
 #include <sys/param.h>
 
-#if defined(sparc) || defined(mips) || defined(ibm032) || defined(__alpha__)
+#if defined(sparc) || defined(mips) || defined(ibm032)
 #define BPF_ALIGN
 #endif
 
diff --git a/sys/netgraph/vjc/ng_vjc.c b/sys/netgraph/vjc/ng_vjc.c
index 4ab17269b5..0c5bafc1c3 100644
--- a/sys/netgraph/vjc/ng_vjc.c
+++ b/sys/netgraph/vjc/ng_vjc.c
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.9.2.5 2002/07/02 23:44:03 archie Exp $
- * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.5 2005/02/17 14:00:00 joerg Exp $
+ * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.6 2006/08/25 22:37:08 swildner Exp $
  * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $
  */
 
@@ -110,8 +110,6 @@ static const struct ng_parse_type ng_vjc_config_type = {
    which are pointers converted to integer indices, so parse them that way. */
 #if _MACHINE_ARCH == i386
 #define NG_VJC_TSTATE_PTR_TYPE	&ng_parse_uint32_type
-#elif _MACHINE_ARCH == alpha
-#define NG_VJC_TSTATE_PTR_TYPE	&ng_parse_uint64_type
 #else
 #error Unspported _MACHINE_ARCH
 #endif
diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 1dcf6f77c2..4855c654da 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -3,7 +3,7 @@
  * Copyright is disclaimed as to the contents of this file.
  *
  * $FreeBSD: src/usr.bin/getconf/progenv.gperf,v 1.1.2.1 2002/10/27 04:18:40 wollman Exp $
- * $DragonFly: src/usr.bin/getconf/progenv.gperf,v 1.2 2003/06/17 04:29:27 dillon Exp $
+ * $DragonFly: src/usr.bin/getconf/progenv.gperf,v 1.3 2006/08/25 22:37:09 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -31,7 +31,7 @@ static const struct map *in_word_set(const char *str, unsigned int len);
  * be updated.  (We cheat here and define the supported environments
  * statically.)
  */
-#if defined(__alpha__) || defined(__sparc64__)
+#if defined(__sparc64__)
 #define	have_LP64_OFF64		NULL
 #endif
 
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index a82d94d534..270545ac6b 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gprof.h	8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/gprof/gprof.h,v 1.2 2006/07/31 12:12:08 corecode Exp $
+ * $DragonFly: src/usr.bin/gprof/gprof.h,v 1.3 2006/08/25 22:37:09 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -41,9 +41,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if __alpha__
-#   include "alpha.h"
-#endif
 #if vax
 #   include "vax.h"
 #endif
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 667dbdfde7..6fd07e464f 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -38,7 +38,7 @@
  * @(#) Copyright (c) 1988, 1989, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/main.c,v 1.118 2005/02/13 13:33:56 harti Exp $
- * $DragonFly: src/usr.bin/make/main.c,v 1.143 2005/09/24 07:27:26 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/main.c,v 1.144 2006/08/25 22:37:09 swildner Exp $
  */
 
 /*
@@ -813,8 +813,6 @@ InitVariables(const char progname[])
 	if ((machine_cpu = getenv("MACHINE_CPU")) == NULL) {
 		if (!strcmp(machine_arch, "i386"))
 			machine_cpu = "i386";
-		else if (!strcmp(machine_arch, "alpha"))
-			machine_cpu = "ev4";
 		else
 			machine_cpu = "unknown";
 	}
diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h
index c01d7549de..c8c7971f72 100644
--- a/usr.bin/xlint/lint1/param.h
+++ b/usr.bin/xlint/lint1/param.h
@@ -31,7 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/xlint/lint1/param.h,v 1.9 2004/05/14 13:44:36 cognet Exp $
- * $DragonFly: src/usr.bin/xlint/lint1/param.h,v 1.3 2006/07/27 00:41:24 corecode Exp $
+ * $DragonFly: src/usr.bin/xlint/lint1/param.h,v 1.4 2006/08/25 22:37:09 swildner Exp $
  */
 
 /*
@@ -66,9 +66,6 @@
 #ifdef __amd64__
 #define PTRDIFF_IS_LONG		1
 #define SIZEOF_IS_ULONG		1
-#elif __alpha__
-#define PTRDIFF_IS_LONG		1
-#define SIZEOF_IS_ULONG		1
 #elif __i386__
 #define PTRDIFF_IS_LONG		0
 #define SIZEOF_IS_ULONG		0