[zaptel-commits] trunk - r912 in /trunk: ./ wcusb.c

[zaptel-commits at lists.digium.com]

Author: russell
Date: Wed Jan 18 22:42:10 2006
New Revision: 912

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

........
r911 | russell | 2006-01-18 23:40:26 -0500 (Wed, 18 Jan 2006) | 2 lines

remove owner field for 2.6.16 (issue #6288)

........

Modified:
    trunk/   (props changed)
    trunk/wcusb.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 22:42:10 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-884,886-891,893-906,908-909
+/branches/1.2:1-884,886-891,893-906,908-911

Modified: trunk/wcusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcusb.c?rev=912&r1=911&r2=912&view=diff
==============================================================================
--- trunk/wcusb.c (original)
+++ trunk/wcusb.c Wed Jan 18 22:42:10 2006
@@ -1448,7 +1448,9 @@
 static struct usb_driver wc_usb_driver =
 {
 #ifdef LINUX26
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	owner: THIS_MODULE,
+#endif
 #else	
 	fops: NULL,
 	minor: 0,