[src/trunk]: src/sys/arch/sparc/stand/ofwboot Fix harmless merge botch.

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1357b00c0aba
branches:  trunk
changeset: 765610:1357b00c0aba
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jun 01 11:42:18 2011 +0000

description:
Fix harmless merge botch.

diffstat:

 sys/arch/sparc/stand/ofwboot/ofdev.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 6da0165f7aae -r 1357b00c0aba sys/arch/sparc/stand/ofwboot/ofdev.c
--- a/sys/arch/sparc/stand/ofwboot/ofdev.c      Wed Jun 01 11:19:19 2011 +0000
+++ b/sys/arch/sparc/stand/ofwboot/ofdev.c      Wed Jun 01 11:42:18 2011 +0000
@@ -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"