The patch titled
TI PCIxx12 CardBus controller support
has been removed from the -mm tree. Its filename is
ti-pcixx12-cardbus-controller-support.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: TI PCIxx12 CardBus controller support
From: Alex Williamson <alex.williamson@xxxxxx>
Add 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@xxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pcmcia/ti113x.h | 1 +
drivers/pcmcia/yenta_socket.c | 1 +
include/linux/pci_ids.h | 1 +
3 files changed, 3 insertions(+)
diff -puN drivers/pcmcia/ti113x.h~ti-pcixx12-cardbus-controller-support drivers/pcmcia/ti113x.h
--- devel/drivers/pcmcia/ti113x.h~ti-pcixx12-cardbus-controller-support 2006-05-13 08:31:29.000000000 -0700
+++ devel-akpm/drivers/pcmcia/ti113x.h 2006-05-13 08:31:29.000000000 -0700
@@ -647,6 +647,7 @@ static int ti12xx_2nd_slot_empty(struct
*/
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 -puN drivers/pcmcia/yenta_socket.c~ti-pcixx12-cardbus-controller-support drivers/pcmcia/yenta_socket.c
--- devel/drivers/pcmcia/yenta_socket.c~ti-pcixx12-cardbus-controller-support 2006-05-13 08:31:29.000000000 -0700
+++ devel-akpm/drivers/pcmcia/yenta_socket.c 2006-05-13 08:31:29.000000000 -0700
@@ -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),
diff -puN include/linux/pci_ids.h~ti-pcixx12-cardbus-controller-support include/linux/pci_ids.h
--- devel/include/linux/pci_ids.h~ti-pcixx12-cardbus-controller-support 2006-05-13 08:31:29.000000000 -0700
+++ devel-akpm/include/linux/pci_ids.h 2006-05-13 08:31:29.000000000 -0700
@@ -729,6 +729,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
_
Patches currently in -mm which might be from alex.williamson@xxxxxx are
git-pcmcia.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
