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

1 files changed, 5 insertions, 0 deletions

diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h
index c33ea08352b8..63e5b8f6b7dd 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, \