Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289075
b: refs/heads/master
c: ffcf128
h: refs/heads/master
i:
  289073: 3078195
  289071: 4aeb64f
v: v3
  • Loading branch information
Mark A. Allyn authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent 7d1b540 commit 80b5659
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2157f896774ace6e98c851878f8089fb861502e2
refs/heads/master: ffcf12810ca11891deb580d166af13fae294fe2e
3 changes: 0 additions & 3 deletions trunk/drivers/staging/sep/sep_driver_hw_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
#ifndef SEP_DRIVER_HW_DEFS__H
#define SEP_DRIVER_HW_DEFS__H

/* PCI ID's */
#define MFLD_PCI_DEVICE_ID 0x0826

/*----------------------- */
/* HW Registers Defines. */
/* */
Expand Down
5 changes: 3 additions & 2 deletions trunk/drivers/staging/sep/sep_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4085,8 +4085,9 @@ static void sep_remove(struct pci_dev *pdev)

/* Initialize struct pci_device_id for our driver */
static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = {
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MFLD_PCI_DEVICE_ID)},
{0}
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0826)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08e9)},
{0}
};

/* Export our pci_device_id structure to user space */
Expand Down

0 comments on commit 80b5659

Please sign in to comment.