Module Name: src
Committed By: tsutsui
Date: Wed Jun 1 11:42:18 UTC 2011
Modified Files:
src/sys/arch/sparc/stand/ofwboot: ofdev.c
Log Message:
Fix harmless merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/stand/ofwboot/ofdev.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/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.31 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.32
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.31 Sat May 21 16:32:00 2011
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Wed Jun 1 11:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.31 2011/05/21 16:32:00 nakayama Exp $ */
+/* $NetBSD: ofdev.c,v 1.32 2011/06/01 11:42:18 tsutsui Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -55,7 +55,6 @@
#include <machine/promlib.h>
#include "ofdev.h"
-#include "net.h"
#include "boot.h"
#include "net.h"
