Date: Tue, 18 Jan 2011 20:26:40 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r217553 - stable/8/sys/modules Message-ID: <201101182026.p0IKQeMY050944@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Jan 18 20:26:40 2011 New Revision: 217553 URL: http://svn.freebsd.org/changeset/base/217553 Log: Fix mismerge. The missing _cxgb=cxgb assignment was causing cxgb to not be built at all, rather than causing it to not be built on just arm and mips. # The merge info looks correct, so this looks like a direct commit. Modified: stable/8/sys/modules/Makefile Modified: stable/8/sys/modules/Makefile ============================================================================== --- stable/8/sys/modules/Makefile Tue Jan 18 19:36:04 2011 (r217552) +++ stable/8/sys/modules/Makefile Tue Jan 18 20:26:40 2011 (r217553) @@ -339,6 +339,8 @@ _siba_bwn= siba_bwn _sym= sym # no uart_cpu_$MACHINE_ARCH _uart= uart +# disable_intr() interferes +_cxgb= cxgb .endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101182026.p0IKQeMY050944>