[zaptel-commits] kpfleming: branch 1.4 r3387 - in /branches/1.4: ./ wcte12xp/base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Mon Dec 10 11:03:07 2007
New Revision: 3387

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

........
r3386 | kpfleming | 2007-12-10 11:02:17 -0600 (Mon, 10 Dec 2007) | 2 lines

cosmetic fix for TE120P cards

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wcte12xp/base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/base.c?view=diff&rev=3387&r1=3386&r2=3387
==============================================================================
--- branches/1.4/wcte12xp/base.c (original)
+++ branches/1.4/wcte12xp/base.c Mon Dec 10 11:03:07 2007
@@ -102,7 +102,7 @@
 	int flags;
 };
 
-static struct t1_desc te12xp = { "Wildcard TE12xP", 0 };
+static struct t1_desc te120p = { "Wildcard TE120P", 0 };
 static struct t1_desc te122 = { "Wildcard TE122", 0 };
 static struct t1_desc te121 = { "Wildcard TE121", 0 };
 
@@ -2012,7 +2012,7 @@
 }
 
 static struct pci_device_id te12xp_pci_tbl[] = {
-	{ 0xd161, 0x0120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te12xp},
+	{ 0xd161, 0x0120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te120p},
 	{ 0xd161, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te121},
 	{ 0xd161, 0x8001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te122},
 	{ 0 }