Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Jan 2013 19:42:07 +0000 (UTC)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r244942 - head/sys/mips/beri
Message-ID:  <201301011942.r01Jg72I026961@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301011942.r01Jg72I026961>