From owner-svn-src-all@FreeBSD.ORG  Tue Jan  1 19:42:07 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
 by hub.freebsd.org (Postfix) with ESMTP id 4A2C7672;
 Tue,  1 Jan 2013 19:42:07 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B8138FC0A;
 Tue,  1 Jan 2013 19:42:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r01Jg7BL026963;
 Tue, 1 Jan 2013 19:42:07 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r01Jg72I026961;
 Tue, 1 Jan 2013 19:42:07 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201301011942.r01Jg72I026961@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jan 2013 19:42:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244942 - head/sys/mips/beri
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2013 19:42:07 -0000

Author: rwatson
Date: Tue Jan  1 19:42:06 2013
New Revision: 244942
URL: http://svnweb.freebsd.org/changeset/base/244942

Log:
  Merge @219932 from Perforce:
  
    FDT headers can't be included if the kernel is compiled without
    FDT support, due to dependence on generated kobj headers.  BERI
    supports both FDT and non-FDT kernels.
  
    Spotted by:	bz

Modified:
  head/sys/mips/beri/beri_machdep.c

Modified: head/sys/mips/beri/beri_machdep.c
==============================================================================
--- head/sys/mips/beri/beri_machdep.c	Tue Jan  1 19:20:51 2013	(r244941)
+++ head/sys/mips/beri/beri_machdep.c	Tue Jan  1 19:42:06 2013	(r244942)
@@ -55,8 +55,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 #include <sys/user.h>
 
+#ifdef FDT
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
+#endif
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>