The patch titled
stex: add new device ids
has been removed from the -mm tree. Its filename is
stex-add-new-device-ids.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: stex: add new device ids
From: "Ed Lin" <ed.lin@xxxxxxxxxxx>
add new device ids
Signed-off-by: Ed Lin <ed.lin@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/stex.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff -puN drivers/scsi/stex.c~stex-add-new-device-ids drivers/scsi/stex.c
--- a/drivers/scsi/stex.c~stex-add-new-device-ids
+++ a/drivers/scsi/stex.c
@@ -118,6 +118,9 @@ enum {
ST_MAX_TARGET_NUM = (ST_MAX_ARRAY_SUPPORTED+1),
ST_MAX_LUN_PER_TARGET = 16,
+ st_shasta = 0,
+ st_vsc = 1,
+
PASSTHRU_REQ_TYPE = 0x00000001,
PASSTHRU_REQ_NO_WAKEUP = 0x00000100,
ST_INTERNAL_TIMEOUT = 30,
@@ -275,6 +278,8 @@ struct st_hba {
unsigned int mu_status;
int out_req_cnt;
+
+ unsigned int cardtype;
};
static const char console_inq_page[] =
@@ -1043,6 +1048,8 @@ stex_probe(struct pci_dev *pdev, const s
(struct status_msg *)(hba->dma_mem + MU_REQ_BUFFER_SIZE);
hba->mu_status = MU_STATE_STARTING;
+ hba->cardtype = (unsigned int) id->driver_data;
+
/* firmware uses id/lun pair for a logical drive, but lun would be
always 0 if CONFIG_SCSI_MULTI_LUN not configured, so we use
channel to map lun here */
@@ -1163,12 +1170,14 @@ static void stex_shutdown(struct pci_dev
}
static struct pci_device_id stex_pci_tbl[] = {
- { PCI_VENDOR_ID_PROMISE, 0x8350, PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_PROMISE, 0xf350, PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_PROMISE, 0x4301, PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_PROMISE, 0x4302, PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_PROMISE, 0x8301, PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_PROMISE, 0x8302, PCI_ANY_ID, PCI_ANY_ID, },
+ { 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0xc350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0xf350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0x4302, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0x8301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x105a, 0x8302, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
+ { 0x1725, 0x7250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_vsc },
{ } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, stex_pci_tbl);
_
Patches currently in -mm which might be from ed.lin@xxxxxxxxxxx are
git-supertrak.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
