aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark A. Allyn <mark.a.allyn@intel.com>2012-02-10 08:52:27 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-10 13:09:56 -0500
commitffcf12810ca11891deb580d166af13fae294fe2e (patch)
treebb1dbbc0ce7647dd676e3f1f1fa438e1fb48af4f /drivers
parent2157f896774ace6e98c851878f8089fb861502e2 (diff)
staging: sep: Add new PCI identifier
[This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/sep/sep_driver_hw_defs.h3
-rw-r--r--drivers/staging/sep/sep_main.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/sep/sep_driver_hw_defs.h b/drivers/staging/sep/sep_driver_hw_defs.h
index c48e49a741b..a6a44817038 100644
--- a/drivers/staging/sep/sep_driver_hw_defs.h
+++ b/drivers/staging/sep/sep_driver_hw_defs.h
@@ -33,9 +33,6 @@
33#ifndef SEP_DRIVER_HW_DEFS__H 33#ifndef SEP_DRIVER_HW_DEFS__H
34#define SEP_DRIVER_HW_DEFS__H 34#define SEP_DRIVER_HW_DEFS__H
35 35
36/* PCI ID's */
37#define MFLD_PCI_DEVICE_ID 0x0826
38
39/*----------------------- */ 36/*----------------------- */
40/* HW Registers Defines. */ 37/* HW Registers Defines. */
41/* */ 38/* */
diff --git a/drivers/staging/sep/sep_main.c b/drivers/staging/sep/sep_main.c
index 7f8362cab7a..421a2b1e898 100644
--- a/drivers/staging/sep/sep_main.c
+++ b/drivers/staging/sep/sep_main.c
@@ -4085,8 +4085,9 @@ static void sep_remove(struct pci_dev *pdev)
4085 4085
4086/* Initialize struct pci_device_id for our driver */ 4086/* Initialize struct pci_device_id for our driver */
4087static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = { 4087static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = {
4088 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MFLD_PCI_DEVICE_ID)}, 4088 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0826)},
4089 {0} 4089 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08e9)},
4090 {0}
4090}; 4091};
4091 4092
4092/* Export our pci_device_id structure to user space */ 4093/* Export our pci_device_id structure to user space */