diff options
| author | imp <imp@FreeBSD.org> | 2003-04-09 22:10:28 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-04-09 22:10:28 +0000 |
| commit | bab509397bb4af795629110fcb65b09f43b0271c (patch) | |
| tree | f5989b06c11b40c3fa11f2ef654d90287a05c1e4 /sys | |
| parent | 7bba953950f8873ab7f46e38f8c6ee23b73f6bd4 (diff) | |
| download | FreeBSD-src-bab509397bb4af795629110fcb65b09f43b0271c.zip FreeBSD-src-bab509397bb4af795629110fcb65b09f43b0271c.tar.gz | |
1.37 was committed prematurely: back out until I can commit all parts at the
same time.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pccard/pccardvar.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index fc09b29..553cea5 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -373,15 +373,14 @@ enum { #define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b #define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b #define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b -#define PCMCIA_CARD_D(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \ +#define PCMCIA_CARD(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \ PCCARD_P(v, p), f, PCCARD_C(v, p) } -#define PCMCIA_CARD2_D(v1, p1, p2, f) \ +#define PCMCIA_CARD2(v1, p1, p2, f) \ { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ f, PCMCIA_CIS_ ## p2} -#if 1 -#define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \ +#define PCMCIA_CARD_ND(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \ PCCARD_P(v, p), f, PCCARD_C(v, p) } -#define PCMCIA_CARD2(v1, p1, p2, f) \ +#define PCMCIA_CARD2_ND(v1, p1, p2, f) \ { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ f, PCMCIA_CIS_ ## p2} -#endif + |
