aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/yenta_socket.c
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@hp.com>2006-05-08 23:22:07 -0600
committerDominik Brodowski <linux@dominikbrodowski.net>2006-06-30 22:09:11 +0200
commit59e35ba1257903eaff5203f62f77554da02f5b63 (patch)
tree09f465afe4cc2a5c33525d925ed83b4b34fe4eca /drivers/pcmcia/yenta_socket.c
parentc533120b8da215dc02310c535fa87c5c480d0f14 (diff)
downloadkernel_samsung_smdk4412-59e35ba1257903eaff5203f62f77554da02f5b63.zip
kernel_samsung_smdk4412-59e35ba1257903eaff5203f62f77554da02f5b63.tar.gz
kernel_samsung_smdk4412-59e35ba1257903eaff5203f62f77554da02f5b63.tar.bz2
[PATCH] pcmcia: TI PCIxx12 CardBus controller support
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. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
-rw-r--r--drivers/pcmcia/yenta_socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index d9d005e..9fcd661 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1312,6 +1312,7 @@ static struct pci_device_id yenta_table [] = {
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),