From 6f88981745da77b28cc0d18234f33a2340c64906 Mon Sep 17 00:00:00 2001
From: Nate Williams <nate@FreeBSD.org>
Date: Wed, 17 Mar 1999 17:39:50 +0000
Subject: [PATCH] Add a Q&D test before loading the pcic module to make sure
 there isn't a compiled in one.

Submitted by:	"Sean O'Connell" <sean@stat.Duke.EDU>
---
 etc/rc.d/pccard | 11 ++++++++---
 etc/rc.pccard   | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 7306e7da1a1a9..1402081305d92 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -3,12 +3,17 @@
 # PC-card startup script
 # HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
 #
-#	$Id: rc.pccard,v 1.6 1998/08/10 19:54:12 brian Exp $
+#	$Id: rc.pccard,v 1.7 1999/02/04 10:06:44 markm Exp $
 #
 
 if [ "X$pccard_enable" = X"YES" ] ; then
-	if kldload pcic; then
-		echo "Kernel pcic module loaded."
+	builtin=`kldstat -v -n 1 | grep pcic | awk '{print $2}'`
+	if [ $builtin = 'pcic' ] ; then
+		echo "PCIC module compiled in"
+	else
+		if kldload pcic; then
+			echo "Kernel pcic module loaded."
+		fi
 	fi
 	if [ "x$pccard_mem" != "xDEFAULT" ] ; then
 		pccardc pccardmem $pccard_mem
diff --git a/etc/rc.pccard b/etc/rc.pccard
index 7306e7da1a1a9..1402081305d92 100644
--- a/etc/rc.pccard
+++ b/etc/rc.pccard
@@ -3,12 +3,17 @@
 # PC-card startup script
 # HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
 #
-#	$Id: rc.pccard,v 1.6 1998/08/10 19:54:12 brian Exp $
+#	$Id: rc.pccard,v 1.7 1999/02/04 10:06:44 markm Exp $
 #
 
 if [ "X$pccard_enable" = X"YES" ] ; then
-	if kldload pcic; then
-		echo "Kernel pcic module loaded."
+	builtin=`kldstat -v -n 1 | grep pcic | awk '{print $2}'`
+	if [ $builtin = 'pcic' ] ; then
+		echo "PCIC module compiled in"
+	else
+		if kldload pcic; then
+			echo "Kernel pcic module loaded."
+		fi
 	fi
 	if [ "x$pccard_mem" != "xDEFAULT" ] ; then
 		pccardc pccardmem $pccard_mem