Index: conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.757
diff -u -r1.757 files
--- conf/files	8 Feb 2003 13:03:56 -0000	1.757
+++ conf/files	13 Feb 2003 22:20:48 -0000
@@ -1479,12 +1479,6 @@
 pccard/pcic_pci.c	optional pcic card pci
 pci/agp.c		optional agp
 pci/agp_if.m		optional agp
-pci/agp_intel.c		optional agp
-pci/agp_via.c		optional agp
-pci/agp_sis.c		optional agp
-pci/agp_ali.c		optional agp
-pci/agp_amd.c		optional agp
-pci/agp_i810.c		optional agp
 pci/alpm.c		optional alpm
 pci/amdpm.c		optional amdpm
 pci/amdpm.c		optional nfpm
Index: conf/files.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.alpha,v
retrieving revision 1.98
diff -u -r1.98 files.alpha
--- conf/files.alpha	28 Jan 2003 13:50:49 -0000	1.98
+++ conf/files.alpha	13 Feb 2003 22:33:20 -0000
@@ -211,3 +211,4 @@
 dev/fb/fb.c			optional	tga
 dev/fb/gfb.c			optional	tga
 dev/gfb/gfb_pci.c		optional	tga
+pci/agp_amd.c			optional	agp
Index: conf/files.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.i386,v
retrieving revision 1.435
diff -u -r1.435 files.i386
--- conf/files.i386	11 Feb 2003 13:19:01 -0000	1.435
+++ conf/files.i386	13 Feb 2003 22:33:40 -0000
@@ -418,3 +418,9 @@
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
 pci/cy_pci.c			optional	cy pci
+pci/agp_intel.c			optional	agp
+pci/agp_via.c			optional	agp
+pci/agp_sis.c			optional	agp
+pci/agp_ali.c			optional	agp
+pci/agp_amd.c			optional	agp
+pci/agp_i810.c			optional	agp
Index: conf/files.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.pc98,v
retrieving revision 1.262
diff -u -r1.262 files.pc98
--- conf/files.pc98	11 Feb 2003 11:43:58 -0000	1.262
+++ conf/files.pc98	13 Feb 2003 22:21:02 -0000
@@ -391,3 +391,9 @@
 pc98/pc98/wd_cd.c		count		wcd wdc
 pccard/mecia.c			optional	mecia card
 pci/cy_pci.c			optional	cy pci
+pci/agp_intel.c			optional agp
+pci/agp_via.c			optional agp
+pci/agp_sis.c			optional agp
+pci/agp_ali.c			optional agp
+pci/agp_amd.c			optional agp
+pci/agp_i810.c			optional agp
Index: pci/agp.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/agp.c,v
retrieving revision 1.24
diff -u -r1.24 agp.c
--- pci/agp.c	21 Jan 2003 08:56:11 -0000	1.24
+++ pci/agp.c	14 Feb 2003 00:28:03 -0000
@@ -96,6 +96,12 @@
 #ifdef __i386__
 	wbinvd();
 #endif
+#ifdef __alpha__
+	/* FIXME: This is most likely not correct as it doesn't flush CPU 
+	 * write caches, but we don't have a facility to do that and 
+	 * this is all linux does, too */
+	alpha_mb();
+#endif
 }
 
 u_int8_t
Index: modules/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/Makefile,v
retrieving revision 1.303
diff -u -r1.303 Makefile
--- modules/Makefile	13 Feb 2003 21:13:10 -0000	1.303
+++ modules/Makefile	13 Feb 2003 22:24:09 -0000
@@ -263,7 +263,8 @@
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
-SUBDIR+=linprocfs \
+SUBDIR+=agp \
+	linprocfs \
 	linux \
 	osf1 \
 	sound \
Index: modules/agp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/agp/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- modules/agp/Makefile	13 Nov 2002 17:43:37 -0000	1.8
+++ modules/agp/Makefile	13 Feb 2003 22:23:54 -0000
@@ -3,8 +3,13 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	agp
-SRCS=	agp.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c
-SRCS+=	agp_i810.c agp_if.c
+SRCS=	agp.c agp_if.c
+.if ${MACHINE_ARCH} == "i386"
+SRCS+=	agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c
+.endif
+.if  ${MACHINE_ARCH} == "alpha"
+SRCS+=	agp_amd.c
+.endif
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
 SRCS+=	opt_bdg.h opt_bus.h
 MFILES=	kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m