Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 125063
b: refs/heads/master
c: 39aced6
h: refs/heads/master
i:
  125061: 13deb1a
  125059: 94eebd5
  125055: 776edea
v: v3
  • Loading branch information
Niels de Vos authored and Linus Torvalds committed Jan 2, 2009
1 parent 912c7b4 commit e0238c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6614999e800cf3a134ce93ea46ef837e3c0e76e
refs/heads/master: 39aced68d664291db3324d0fcf0985ab5626aac2
3 changes: 3 additions & 0 deletions trunk/drivers/serial/8250_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -2387,6 +2387,9 @@ static struct pci_device_id serial_pci_tbl[] = {
* www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516.html).
* For now just used the hex ID 0x950a.
*/
{ PCI_VENDOR_ID_OXSEMI, 0x950a,
PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL, 0, 0,
pbn_b0_2_115200 },
{ PCI_VENDOR_ID_OXSEMI, 0x950a,
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_b0_2_1130000 },
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/pci_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,7 @@
#define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081
#define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082
#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050
#define PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL 0x2530

#define PCI_VENDOR_ID_RADISYS 0x1331

Expand Down

0 comments on commit e0238c0

Please sign in to comment.