From owner-svn-src-head@FreeBSD.ORG Tue May 6 11:12:56 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4FFA8D6; Tue, 6 May 2014 11:12:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2D218CE; Tue, 6 May 2014 11:12:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46BCukH052439; Tue, 6 May 2014 11:12:56 GMT (envelope-from se@svn.freebsd.org) Received: (from se@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46BCuNf052436; Tue, 6 May 2014 11:12:56 GMT (envelope-from se@svn.freebsd.org) Message-Id: <201405061112.s46BCuNf052436@svn.freebsd.org> From: Stefan Esser Date: Tue, 6 May 2014 11:12:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265433 - in head/sys: conf modules/drm2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 11:12:56 -0000 Author: se Date: Tue May 6 11:12:56 2014 New Revision: 265433 URL: http://svnweb.freebsd.org/changeset/base/265433 Log: Fix buildkernel breakage, which was fall-out from the move of options to src.opts.mk. Modified: head/sys/conf/kmod.mk head/sys/modules/drm2/Makefile Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Tue May 6 10:53:51 2014 (r265432) +++ head/sys/conf/kmod.mk Tue May 6 11:12:56 2014 (r265433) @@ -72,6 +72,7 @@ OBJCOPY?= objcopy .error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND" .endif +.include .include .include Modified: head/sys/modules/drm2/Makefile ============================================================================== --- head/sys/modules/drm2/Makefile Tue May 6 10:53:51 2014 (r265432) +++ head/sys/modules/drm2/Makefile Tue May 6 11:12:56 2014 (r265433) @@ -1,5 +1,6 @@ # $FreeBSD$ +.include .include .if ${MACHINE_CPUARCH} == "amd64"