[zaptel-commits] trunk r1098 - in /trunk: ./ tor2-hw.h

[zaptel-commits at lists.digium.com]

Author: tilghman
Date: Tue May 30 23:01:04 2006
New Revision: 1098

URL: http://svn.digium.com/view/zaptel?rev=1098&view=rev
Log:
Merged revisions 1097 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1097 | tilghman | 2006-05-30 22:59:50 -0500 (Tue, 30 May 2006) | 2 lines

Bug 7248 - PCI IDs for a tor2 clone card

........

Modified:
    trunk/   (props changed)
    trunk/tor2-hw.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue May 30 23:01:04 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097

Modified: trunk/tor2-hw.h
URL: http://svn.digium.com/view/zaptel/trunk/tor2-hw.h?rev=1098&r1=1097&r2=1098&view=diff
==============================================================================
--- trunk/tor2-hw.h (original)
+++ trunk/tor2-hw.h Tue May 30 23:01:04 2006
@@ -126,6 +126,7 @@
 	{ PCI_VENDOR_ID_PLX, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"PLX 9030" },	 /* PLX 9030 Development board */
 	{ PCI_VENDOR_ID_PLX, 0x3001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"PLX Development Board" },	 /* PLX 9030 Development board */
 	{ PCI_VENDOR_ID_PLX, 0xD00D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"Tormenta 2 Quad T1/PRI or E1/PRA" }, /* Tormenta 2 */
+	{ PCI_VENDOR_ID_PLX, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)"Tormenta 2 Quad T1/E1 (non-Digium clone)" }, /* Tormenta 2 clone */
 	{ 0, }
 };