From 8616206ff9b7a59acec5dd2073a3f260b1b14779 Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 24 Jun 2005 14:36:54 +0000 Subject: Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite) --- sys/dev/fe/if_fe_pccard.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'sys/dev/fe') diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c index 5acff6a..a143e63 100644 --- a/sys/dev/fe/if_fe_pccard.c +++ b/sys/dev/fe/if_fe_pccard.c @@ -67,21 +67,21 @@ static const struct fe_pccard_product { #define MPP_MBH10302 1 } fe_pccard_products[] = { /* These need to be first */ - { PCMCIA_CARD(FUJITSU2, FMV_J181, 0), MPP_MBH10302 }, - { PCMCIA_CARD(FUJITSU2, FMV_J182, 0), 0 }, - { PCMCIA_CARD(FUJITSU2, FMV_J182A, 0), 0 }, - { PCMCIA_CARD(FUJITSU2, ITCFJ182A, 0), 0 }, + { PCMCIA_CARD(FUJITSU2, FMV_J181), MPP_MBH10302 }, + { PCMCIA_CARD(FUJITSU2, FMV_J182), 0 }, + { PCMCIA_CARD(FUJITSU2, FMV_J182A), 0 }, + { PCMCIA_CARD(FUJITSU2, ITCFJ182A), 0 }, /* These need to be second */ - { PCMCIA_CARD(TDK, LAK_CD021BX, 0), 0 }, - { PCMCIA_CARD(TDK, LAK_CF010, 0), 0 }, + { PCMCIA_CARD(TDK, LAK_CD021BX), 0 }, + { PCMCIA_CARD(TDK, LAK_CF010), 0 }, #if 0 /* XXX 86960-based? */ - { PCMCIA_CARD(TDK, LAK_DFL9610, 1), 0 }, + { PCMCIA_CARD(TDK, LAK_DFL9610), 0 }, #endif - { PCMCIA_CARD(CONTEC, CNETPC, 0), 0 }, - { PCMCIA_CARD(FUJITSU, LA501, 0), 0 }, - { PCMCIA_CARD(FUJITSU, LA10S, 0), 0 }, - { PCMCIA_CARD(FUJITSU, NE200T, 0), MPP_MBH10302 },/* Sold by Eagle */ - { PCMCIA_CARD(RATOC, REX_R280, 0), 0 }, + { PCMCIA_CARD(CONTEC, CNETPC), 0 }, + { PCMCIA_CARD(FUJITSU, LA501), 0 }, + { PCMCIA_CARD(FUJITSU, LA10S), 0 }, + { PCMCIA_CARD(FUJITSU, NE200T), MPP_MBH10302 },/* Sold by Eagle */ + { PCMCIA_CARD(RATOC, REX_R280), 0 }, { { NULL } } }; -- cgit v1.1