Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83481
b: refs/heads/master
c: 82f5608
h: refs/heads/master
i:
  83479: ee3f81f
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Feb 6, 2008
1 parent 670271a commit 923395f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: 2b54aaef7a3a77f208bc14f576010da4fb8dfe29
refs/heads/master: 82f560874e88bd1fd8c98a6254d65a1dffab3876
7 changes: 4 additions & 3 deletions trunk/drivers/misc/phantom.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <asm/atomic.h>
#include <asm/io.h>

#define PHANTOM_VERSION "n0.9.7"
#define PHANTOM_VERSION "n0.9.8"

#define PHANTOM_MAX_MINORS 8

Expand Down Expand Up @@ -456,8 +456,9 @@ static int phantom_resume(struct pci_dev *pdev)
#endif

static struct pci_device_id phantom_pci_tbl[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),
.class = PCI_CLASS_BRIDGE_OTHER << 8, .class_mask = 0xffff00 },
{ .vendor = PCI_VENDOR_ID_PLX, .device = PCI_DEVICE_ID_PLX_9050,
.subvendor = PCI_VENDOR_ID_PLX, .subdevice = PCI_DEVICE_ID_PLX_9050,
.class = PCI_CLASS_BRIDGE_OTHER << 8, .class_mask = 0xffff00 },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, phantom_pci_tbl);
Expand Down

0 comments on commit 923395f

Please sign in to comment.