[zaptel-commits] trunk r959 - in /trunk: ./ xpp/xpp_usb.c

[zaptel-commits at lists.digium.com]

Author: russell
Date: Thu Feb 16 11:58:14 2006
New Revision: 959

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

........
r958 | russell | 2006-02-16 12:56:53 -0500 (Thu, 16 Feb 2006) | 2 lines

fix build for linux 2.6.16 (issue #6505)

........

Modified:
    trunk/   (props changed)
    trunk/xpp/xpp_usb.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Thu Feb 16 11:58:14 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949
+/branches/1.2:1-916,918-936,938-949,958

Modified: trunk/xpp/xpp_usb.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_usb.c?rev=959&r1=958&r2=959&view=diff
==============================================================================
--- trunk/xpp/xpp_usb.c (original)
+++ trunk/xpp/xpp_usb.c Thu Feb 16 11:58:14 2006
@@ -362,7 +362,9 @@
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver xusb_driver = {
-	.owner =	THIS_MODULE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+        .owner: THIS_MODULE,
+#endif
 	.name =		"xpp_usb",
 	.probe =	xusb_probe,
 	.disconnect =	xusb_disconnect,