[PATCH] TI PCIxx12 CardBus controller support

[Alex Williamson <alex.williamson@hp.com>]

Hi,

   The patch below adds support for the TI PCIxx12 CardBus controllers.
This seems to be sufficient to detect the cardbus bridge on an HP nc6320
and works with an orinoco wifi card.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r ce52ec65b1a0 drivers/pcmcia/ti113x.h
--- a/drivers/pcmcia/ti113x.h	Tue May  9 00:41:05 2006
+++ b/drivers/pcmcia/ti113x.h	Mon May  8 23:08:29 2006
@@ -647,6 +647,7 @@
 		 */
 		break;
 
+	case PCI_DEVICE_ID_TI_XX12:
 	case PCI_DEVICE_ID_TI_X515:
 	case PCI_DEVICE_ID_TI_X420:
 	case PCI_DEVICE_ID_TI_X620:
diff -r ce52ec65b1a0 drivers/pcmcia/yenta_socket.c
--- a/drivers/pcmcia/yenta_socket.c	Tue May  9 00:41:05 2006
+++ b/drivers/pcmcia/yenta_socket.c	Mon May  8 23:08:29 2006
@@ -1232,6 +1232,7 @@
 
 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11, TI12XX),
 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X515, TI12XX),
+	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX12, TI12XX),
 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X420, TI12XX),
 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X620, TI12XX),
 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7410, TI12XX),
diff -r ce52ec65b1a0 include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	Tue May  9 00:41:05 2006
+++ b/include/linux/pci_ids.h	Mon May  8 23:08:29 2006
@@ -726,6 +726,7 @@
 #define PCI_DEVICE_ID_TI_4450		0x8011
 #define PCI_DEVICE_ID_TI_XX21_XX11	0x8031
 #define PCI_DEVICE_ID_TI_X515		0x8036
+#define PCI_DEVICE_ID_TI_XX12		0x8039
 #define PCI_DEVICE_ID_TI_1130		0xac12
 #define PCI_DEVICE_ID_TI_1031		0xac13
 #define PCI_DEVICE_ID_TI_1131		0xac15


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/