The patch titled hostap_cs: added support for Proxim Harmony PCI W-Lan card has been added to the -mm tree. Its filename is hostap_cs-added-support-for-proxim-harmony-pci-w-lan.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: hostap_cs: added support for Proxim Harmony PCI W-Lan card From: Christian Steineck <Christian.Steineck@xxxxxx> Add support for Proxim Harmony PCI W-Lan Card (uses pd6729 based pcmcia2pci bridge) Signed-off-by: Christian Steineck <memphis@xxxxxxxxxx> Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/net/wireless/hostap/hostap_cs.c | 1 + 1 files changed, 1 insertion(+) diff -puN drivers/net/wireless/hostap/hostap_cs.c~hostap_cs-added-support-for-proxim-harmony-pci-w-lan drivers/net/wireless/hostap/hostap_cs.c --- a/drivers/net/wireless/hostap/hostap_cs.c~hostap_cs-added-support-for-proxim-harmony-pci-w-lan +++ a/drivers/net/wireless/hostap/hostap_cs.c @@ -838,6 +838,7 @@ static struct pcmcia_device_id hostap_cs PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), + PCMCIA_DEVICE_MANF_CARD(0x0126, 0x0002), PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", 0x74c5e40d), PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", _ Patches currently in -mm which might be from Christian.Steineck@xxxxxx are hostap_cs-added-support-for-proxim-harmony-pci-w-lan.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html