diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-25 23:26:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-25 23:26:21 -0800 |
| commit | 19bc291c99f018bd4f2c38bbf69144086dca903f (patch) | |
| tree | 9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /include/pcmcia | |
| parent | 04488734806948624dabc4514f96f14cd75b9a50 (diff) | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (diff) | |
| download | kernel_samsung_smdk4412-19bc291c99f018bd4f2c38bbf69144086dca903f.zip kernel_samsung_smdk4412-19bc291c99f018bd4f2c38bbf69144086dca903f.tar.gz kernel_samsung_smdk4412-19bc291c99f018bd4f2c38bbf69144086dca903f.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/rt2x00/rt2800pci.c
Diffstat (limited to 'include/pcmcia')
| -rw-r--r-- | include/pcmcia/device_id.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h index c33ea08..63e5b8f 100644 --- a/include/pcmcia/device_id.h +++ b/include/pcmcia/device_id.h @@ -34,6 +34,11 @@ .prod_id = { NULL, (v2), NULL, NULL }, \ .prod_id_hash = { 0, (vh2), 0, 0 }, } +#define PCMCIA_DEVICE_PROD_ID3(v3, vh3) { \ + .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID3, \ + .prod_id = { NULL, NULL, (v3), NULL }, \ + .prod_id_hash = { 0, 0, (vh3), 0 }, } + #define PCMCIA_DEVICE_PROD_ID12(v1, v2, vh1, vh2) { \ .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \ PCMCIA_DEV_ID_MATCH_PROD_ID2, \ |