diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 17:17:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 17:17:59 -0500 |
| commit | fe05f54181db868c5720cc4dc0741227b9ba5a60 (patch) | |
| tree | 922b7aaefa56cdd82f2152db57806a7a06dd6425 /include | |
| parent | e5cef95d58d1e711b0bd6b00018278a06defb274 (diff) | |
| parent | 67bc620006a30cf5dcbf409dbbd4fd93179ddfb1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
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 346d81ece287..e04e0b0d9a25 100644 --- a/include/pcmcia/device_id.h +++ b/include/pcmcia/device_id.h | |||
| @@ -72,6 +72,15 @@ | |||
| 72 | .prod_id = { (v1), (v2), (v3), (v4) }, \ | 72 | .prod_id = { (v1), (v2), (v3), (v4) }, \ |
| 73 | .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } | 73 | .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } |
| 74 | 74 | ||
| 75 | #define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \ | ||
| 76 | .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ | ||
| 77 | PCMCIA_DEV_ID_MATCH_CARD_ID| \ | ||
| 78 | PCMCIA_DEV_ID_MATCH_PROD_ID1, \ | ||
| 79 | .manf_id = (manf), \ | ||
| 80 | .card_id = (card), \ | ||
| 81 | .prod_id = { (v1), NULL, NULL, NULL }, \ | ||
| 82 | .prod_id_hash = { (vh1), 0, 0, 0 }, } | ||
| 83 | |||
| 75 | 84 | ||
| 76 | /* multi-function devices */ | 85 | /* multi-function devices */ |
| 77 | 86 | ||