From 19a5dff20bccf0ee8c0f93e9aa72a3dfeda35047 Mon Sep 17 00:00:00 2001
From: imp <imp@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 18 Jan 2011 20:26:40 +0000
Subject: [PATCH] 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.


git-svn-id: svn://svn.freebsd.org/base/stable/8@217553 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/modules/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b67cd5991..967253e35 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -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)
-- 
2.45.0