Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sys/arch/m68k/m68k pullup-1-6 ticket #497 (scottr).



details:   https://anonhg.NetBSD.org/src/rev/b4d173f9f99d
branches:  netbsd-1-6
changeset: 528425:b4d173f9f99d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 15 16:10:01 2002 +0000

description:
pullup-1-6 ticket #497 (scottr).

Original log message:
Correct misplaced #endif that causes compile-time error if
neither M68040 nor M68060 are configured into the kernel.

diffstat:

 sys/arch/m68k/m68k/bus_dma.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r f8a13ce870e2 -r b4d173f9f99d sys/arch/m68k/m68k/bus_dma.c
--- a/sys/arch/m68k/m68k/bus_dma.c      Mon Jul 15 16:08:15 2002 +0000
+++ b/sys/arch/m68k/m68k/bus_dma.c      Mon Jul 15 16:10:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.1.6.1 2002/07/05 13:52:43 lukem Exp $ */
+/* $NetBSD: bus_dma.c,v 1.1.6.2 2002/07/15 16:10:01 thorpej Exp $ */
 
 /*
  * This file was taken from from alpha/common/bus_dma.c
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.1.6.1 2002/07/05 13:52:43 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.1.6.2 2002/07/15 16:10:01 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -545,8 +545,8 @@
 #endif
                        }
                        break;
+#endif /* M68040 || M68060 */
                }
-#endif /* M68040 || M68060 */
        }
 }
 



Home | Main Index | Thread Index | Old Index