5 files changed, 10 insertions, 31 deletions
diff --git a/sys/arch/m68k/Makefile b/sys/arch/m68k/Makefile
deleted file mode 100644
index ad95c2430dd..00000000000
--- a/sys/arch/m68k/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/05/29 21:05:10 niklas Exp $
-#	$NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $
-
-SUBDIR+= fpsp
-
-.include <bsd.subdir.mk>
diff --git a/sys/arch/m68k/fpsp/Makefile b/sys/arch/m68k/fpsp/Makefile
index 284408a3557..f47224d682e 100644
--- a/sys/arch/m68k/fpsp/Makefile
+++ b/sys/arch/m68k/fpsp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1996/06/16 10:33:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 1996/08/04 01:22:44 niklas Exp $
 #	$NetBSD: Makefile,v 1.4 1994/10/26 07:48:46 cgd Exp $
 
 #	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -326,7 +326,7 @@ l_stwotox.s: stwotox.s
 #
 #	Extract all files from SCCS directory
 #
-clean cleandir:
+clean:
 	rm -f $(H_FILES)
 	rm -f $(S_FILES)
 	rm -f $(O_FILES)
@@ -335,15 +335,4 @@ clean cleandir:
 	rm -f $(LIB_O_FILES)
 	rm -f $(LIB_TARGET)
 
-_SUBDIRUSE:
-
-all:
-
-depend:
-
-install:
-
-includes:
-
-.include <bsd.obj.mk>
-.include <bsd.own.mk>
+clobber:	clean
diff --git a/sys/arch/m68k/include/cdefs.h b/sys/arch/m68k/include/cdefs.h
index 1a5aac29990..02689ae991a 100644
--- a/sys/arch/m68k/include/cdefs.h
+++ b/sys/arch/m68k/include/cdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdefs.h,v 1.3 1996/05/29 18:38:30 niklas Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.4 1996/08/04 01:22:45 niklas Exp $	*/
 /*	$NetBSD: cdefs.h,v 1.2 1995/03/23 20:10:33 jtc Exp $	*/
 
 /*
@@ -31,8 +31,6 @@
 	__asm__(".stabs msg,30,0,0,0");			\
 	__asm__(".stabs \"_/**/sym\",1,0,0,0")
 #endif
-#else
-#define	__warn_references(sym,msg)	/* nothing */
 #endif
 
 #endif /* !_M68K_CDEFS_H_ */
diff --git a/sys/arch/m68k/include/types.h b/sys/arch/m68k/include/types.h
index c78f7ab4b9b..a35b76894da 100644
--- a/sys/arch/m68k/include/types.h
+++ b/sys/arch/m68k/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.3 1996/05/29 18:38:40 niklas Exp $	*/
+/*	$OpenBSD: types.h,v 1.4 1996/08/04 01:22:45 niklas Exp $	*/
 /*	$NetBSD: types.h,v 1.9 1995/07/06 03:39:38 cgd Exp $	*/
 
 /*-
@@ -64,9 +64,7 @@ typedef	short			  int16_t;
 typedef	unsigned short		u_int16_t;
 typedef	int			  int32_t;
 typedef	unsigned int		u_int32_t;
-/* LONGLONG */
 typedef	long long		  int64_t;
-/* LONGLONG */
 typedef	unsigned long long	u_int64_t;
 
 typedef int32_t			register_t;
diff --git a/sys/arch/m68k/m68k/db_disasm.c b/sys/arch/m68k/m68k/db_disasm.c
index d90cf0319df..b56d81be049 100644
--- a/sys/arch/m68k/m68k/db_disasm.c
+++ b/sys/arch/m68k/m68k/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.3 1996/05/09 22:30:09 niklas Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.4 1996/08/04 01:22:46 niklas Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.14 1996/04/29 20:50:26 leo Exp $	*/
 
 /*
@@ -1955,10 +1955,10 @@ print_fcode(dbuf, fc)
 	dis_buffer_t *dbuf;
 	u_short fc;
 {
-	if (ISBITSET(fc, 5))
-		printu_bf(dbuf, fc, 4, 0);
-	else if (ISBITSET(fc, 4))
-		PRINT_DREG(dbuf, BITFIELD(fc, 3, 0));
+	if (ISBITSET(fc, 4))
+		printu_bf(dbuf, fc, 3, 0);
+	else if (ISBITSET(fc, 3))
+		PRINT_DREG(dbuf, BITFIELD(fc, 2, 0));
 	else if (fc == 1)
 		addstr(dbuf, "sfc");
 	else