1 files changed, 5 insertions, 15 deletions

diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index adf334ec922a0..1a9cb71ebfff8 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -241,21 +241,11 @@ ep_pccard_detach(device_t dev)
 }
 
 static const struct pccard_product ep_pccard_products[] = {
-	{ PCMCIA_STR_3COM_3C574,		PCMCIA_VENDOR_3COM,
-	  PCMCIA_PRODUCT_3COM_3C574,		0,
-	  PCMCIA_CIS_3COM_3C574 },
-	{ PCMCIA_STR_3COM_3C589,		PCMCIA_VENDOR_3COM,
-	  PCMCIA_PRODUCT_3COM_3C589,		0,
-	  PCMCIA_CIS_3COM_3C589 },
-	{ PCMCIA_STR_3COM_3CXEM556,		PCMCIA_VENDOR_3COM,
-	  PCMCIA_PRODUCT_3COM_3CXEM556,		0,
-	  PCMCIA_CIS_3COM_3CXEM556 },
-	{ PCMCIA_STR_3COM_3CXEM556INT,		PCMCIA_VENDOR_3COM,
-	  PCMCIA_PRODUCT_3COM_3CXEM556INT,	0,
-	  PCMCIA_CIS_3COM_3CXEM556INT },
-	{ PCMCIA_STR_3COM_3CCFEM556BI,		PCMCIA_VENDOR_3COM,
-	  PCMCIA_PRODUCT_3COM_3CCFEM556BI,	0,
-	  PCMCIA_CIS_3COM_3CCFEM556BI },
+	PCMCIA_CARD(3COM, 3C574, 0),
+	PCMCIA_CARD(3COM, 3C589, 0),
+	PCMCIA_CARD(3COM, 3CXEM556, 0),
+	PCMCIA_CARD(3COM, 3CXEM556INT, 0),
+	PCMCIA_CARD(3COM, 3CCFEM556BI, 0),
 	{ NULL }
 };