diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 12:23:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 12:23:08 -0400 |
commit | f33c596a2f921696391801b637ed50d514634079 (patch) | |
tree | abc353fe3ef128e60e20a6b73f52858ce6d39eff /include | |
parent | 250f8e3db646028353a2a737ddb7a894c97a1098 (diff) | |
parent | 74411c04540404a1ff29d254584ef393e150aeda (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
smc91c92_cs.c: fix bogus compiler warning
orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
hostap_cs: support cards with "Version 01.02" as third product ID
pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
pxa2xx pcmcia - stargate 2 use gpio array.
pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
drivers:pcmcia:soc_common: make socket_init and socket_suspend optional
Diffstat (limited to 'include')
-rw-r--r-- | include/pcmcia/device_id.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h index 63e5b8f6b7dd..00dbfac9c6e1 100644 --- a/include/pcmcia/device_id.h +++ b/include/pcmcia/device_id.h | |||
@@ -95,6 +95,15 @@ | |||
95 | .prod_id = { (v1), NULL, NULL, NULL }, \ | 95 | .prod_id = { (v1), NULL, NULL, NULL }, \ |
96 | .prod_id_hash = { (vh1), 0, 0, 0 }, } | 96 | .prod_id_hash = { (vh1), 0, 0, 0 }, } |
97 | 97 | ||
98 | #define PCMCIA_DEVICE_MANF_CARD_PROD_ID3(manf, card, v3, vh3) { \ | ||
99 | .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ | ||
100 | PCMCIA_DEV_ID_MATCH_CARD_ID| \ | ||
101 | PCMCIA_DEV_ID_MATCH_PROD_ID3, \ | ||
102 | .manf_id = (manf), \ | ||
103 | .card_id = (card), \ | ||
104 | .prod_id = { NULL, NULL, (v3), NULL }, \ | ||
105 | .prod_id_hash = { 0, 0, (vh3), 0 }, } | ||
106 | |||
98 | 107 | ||
99 | /* multi-function devices */ | 108 | /* multi-function devices */ |
100 | 109 | ||