aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-02-28 01:18:29 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-01 11:11:26 +0100
commitf0892b89e3c19c7d805825ca12511d26dcdf6415 (patch)
tree4af323f059cb9ba4e8f237c7c7a298d713324937
parent42935656914b813c99f91cbac421fe677a6f34ab (diff)
downloadkernel_samsung_aries-f0892b89e3c19c7d805825ca12511d26dcdf6415.zip
kernel_samsung_aries-f0892b89e3c19c7d805825ca12511d26dcdf6415.tar.gz
kernel_samsung_aries-f0892b89e3c19c7d805825ca12511d26dcdf6415.tar.bz2
[PATCH] pcmcia: Add macro to match PCMCIA cards by numeric ID and first vendor string
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>
-rw-r--r--include/pcmcia/device_id.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h
index 346d81e..e04e0b0 100644
--- a/include/pcmcia/device_id.h
+++ b/include/pcmcia/device_id.h
@@ -72,6 +72,15 @@
.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 */