Module Name: src
Committed By: nisimura
Date: Wed Jan 12 07:38:44 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: machdep.c
src/sys/arch/sandpoint/stand/netboot: main.c
Log Message:
- remove duplicate an opt include line.
- restore a lost indent.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sandpoint/stand/netboot/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.53 src/sys/arch/sandpoint/sandpoint/machdep.c:1.54
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.53 Tue Jan 11 13:29:09 2011
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Wed Jan 12 07:38:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.53 2011/01/11 13:29:09 nisimura Exp $ */
+/* $NetBSD: machdep.c,v 1.54 2011/01/12 07:38:44 nisimura Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,12 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2011/01/11 13:29:09 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2011/01/12 07:38:44 nisimura Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_ipkdb.h"
-#include "opt_modular.h"
#include "opt_interrupt.h"
#include "opt_modular.h"
Index: src/sys/arch/sandpoint/stand/netboot/main.c
diff -u src/sys/arch/sandpoint/stand/netboot/main.c:1.39 src/sys/arch/sandpoint/stand/netboot/main.c:1.40
--- src/sys/arch/sandpoint/stand/netboot/main.c:1.39 Tue Jan 11 08:19:34 2011
+++ src/sys/arch/sandpoint/stand/netboot/main.c Wed Jan 12 07:38:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.39 2011/01/11 08:19:34 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.40 2011/01/12 07:38:43 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -210,7 +210,7 @@
if (modules_enabled) {
module_add(fsmod);
if (fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
- module_add(fsmod2);
+ module_add(fsmod2);
kmodloadp = marks[MARK_END];
btinfo_modulelist = NULL;
module_load(bname);
