The patch titled synclink_gt: add GT2 adapter support has been added to the -mm tree. Its filename is synclink_gt-add-gt2-adapter-support.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: synclink_gt: add GT2 adapter support From: Paul Fulghum <paulkf@xxxxxxxxxxxxx> Add support for SyncLink GT2 adapter to driver. Signed-off-by: Paul Fulghum <paulkf@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/char/synclink_gt.c | 8 +++++++- include/linux/synclink.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN drivers/char/synclink_gt.c~synclink_gt-add-gt2-adapter-support drivers/char/synclink_gt.c --- a/drivers/char/synclink_gt.c~synclink_gt-add-gt2-adapter-support +++ a/drivers/char/synclink_gt.c @@ -101,6 +101,7 @@ MODULE_LICENSE("GPL"); static struct pci_device_id pci_table[] = { {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, + {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT2_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT4_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, {PCI_VENDOR_ID_MICROGATE, SYNCLINK_AC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, {0,}, /* terminate list */ @@ -3277,6 +3278,9 @@ static void add_device(struct slgt_info case SYNCLINK_GT_DEVICE_ID: devstr = "GT"; break; + case SYNCLINK_GT2_DEVICE_ID: + devstr = "GT2"; + break; case SYNCLINK_GT4_DEVICE_ID: devstr = "GT4"; break; @@ -3354,7 +3358,9 @@ static void device_init(int adapter_num, int i; int port_count = 1; - if (pdev->device == SYNCLINK_GT4_DEVICE_ID) + if (pdev->device == SYNCLINK_GT2_DEVICE_ID) + port_count = 2; + else if (pdev->device == SYNCLINK_GT4_DEVICE_ID) port_count = 4; /* allocate device instances for all ports */ diff -puN include/linux/synclink.h~synclink_gt-add-gt2-adapter-support include/linux/synclink.h --- a/include/linux/synclink.h~synclink_gt-add-gt2-adapter-support +++ a/include/linux/synclink.h @@ -172,6 +172,7 @@ typedef struct _MGSL_PARAMS #define SYNCLINK_GT_DEVICE_ID 0x0070 #define SYNCLINK_GT4_DEVICE_ID 0x0080 #define SYNCLINK_AC_DEVICE_ID 0x0090 +#define SYNCLINK_GT2_DEVICE_ID 0x00A0 #define MGSL_MAX_SERIAL_NUMBER 30 /* _ Patches currently in -mm which might be from paulkf@xxxxxxxxxxxxx are sparse-fixes-for-synclink_cs.patch remove-dead-entry-in-net-wan-kconfig.patch more-tty-cleanups-in-drivers-char.patch fix-memory-leak-in-rocketport-rp_do_receive.patch add-synclink_gt-custom-hdlc-idle.patch add-synclink_gt-crc-return-feature.patch fix-synclink_gt-diagnostics-error-reporting.patch synclink_gt-add-gt2-adapter-support.patch revert-tty-buffering-comment-out-debug-code.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