diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 55ddde4f14b5..e4a2fb9ad3c1 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -66,12 +66,6 @@ int	pccard_debug = 0;
 #define DEVPRVERBOSE(arg) if (bootverbose) device_printf arg
 #endif
 
-#ifdef PCCARDVERBOSE
-int	pccard_verbose = 1;
-#else
-int	pccard_verbose = 0;
-#endif
-
 static int	pccard_ccr_read(struct pccard_function *pf, int ccr);
 static void	pccard_ccr_write(struct pccard_function *pf, int ccr, int val);
 static int	pccard_attach_card(device_t dev);
@@ -168,7 +162,7 @@ pccard_attach_card(device_t dev)
 		return (1);
 	}
 
-	if (1)
+	if (bootverbose || pccard_debug)
 		pccard_print_cis(dev);
 
 	DEVPRINTF((dev, "functions scanning\n"));
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 83abcf6f094c..e1e8f38cd863 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -231,7 +231,7 @@ void pccard_check_cis_quirks(device_t dev)
 			  (strcmp(sc->card.cis1_info[1],
 					  pccard_cis_quirks[i].cis1_info[1]) == 0)))) {
 			if (!wiped) {
-				if (pccard_verbose) {
+				if (bootverbose) {
 					device_printf(dev, "using CIS quirks for ");
 					for (j = 0; j < 4; j++) {
 						if (sc->card.cis1_info[j] == NULL)