]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: Add macro to match PCMCIA cards by numeric ID and first vendor string
authorPavel Roskin <proski@gnu.org>
Tue, 28 Feb 2006 06:18:29 +0000 (01:18 -0500)
committerDominik Brodowski <linux@dominikbrodowski.net>
Wed, 1 Mar 2006 10:11:26 +0000 (11:11 +0100)
This is needed to distinguish Intersil and non-Intersil cards with
numeric ID 0x0156, 0x0002.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
include/pcmcia/device_id.h

index 346d81ece2873ec9aeeafd8e9b5bd3a92b34ee4d..e04e0b0d9a25a5b0c4903f3a51cab2af33de6d90 100644 (file)
        .prod_id = { (v1), (v2), (v3), (v4) }, \
        .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, }
 
+#define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \
+       .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                       PCMCIA_DEV_ID_MATCH_CARD_ID| \
+                       PCMCIA_DEV_ID_MATCH_PROD_ID1, \
+       .manf_id = (manf), \
+       .card_id = (card), \
+       .prod_id = { (v1), NULL, NULL, NULL }, \
+       .prod_id_hash = { (vh1), 0, 0, 0 }, }
+
 
 /* multi-function devices */