[Pkg-voip-commits] r10083 - in /dahdi-linux/trunk/debian: changelog patches/fix_define_dev patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Jan 28 14:08:17 2013
New Revision: 10083

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10083
Log:
Patch fix_define_dev: fix building with kernel 3.8.

Added:
    dahdi-linux/trunk/debian/patches/fix_define_dev
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=10083&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Jan 28 14:08:17 2013
@@ -1,3 +1,9 @@
+dahdi-linux (1:2.6.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Patch fix_define_dev: fix building with kernel 3.8.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 28 Jan 2013 14:23:01 +0200
+
 dahdi-linux (1:2.6.1+dfsg-1) unstable; urgency=low
 
   * New upstream release candidate:

Added: dahdi-linux/trunk/debian/patches/fix_define_dev
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/fix_define_dev?rev=10083&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/fix_define_dev (added)
+++ dahdi-linux/trunk/debian/patches/fix_define_dev Mon Jan 28 14:08:17 2013
@@ -1,0 +1,35 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Mon, 28 Jan 2013 15:22:13 +0200
+Subject: [PATCH] Redefine the removed __dev* for now
+
+The __dev* directives and functions were removed in 3.8, as they
+are no-ops. We still have use of them for older versions, thus
+we should define them (as noops) if they don't exist.
+
+Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+---
+ include/dahdi/kernel.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
+index 13bbb20..4a98af5 100644
+--- a/include/dahdi/kernel.h
++++ b/include/dahdi/kernel.h
+@@ -120,6 +120,14 @@
+ #  endif
+ #endif
+ 
++/* __dev* were removed in 3.8. They still have effect in 2.6.18. */
++#ifndef __devinit
++#  define __devinit
++#  define __devinitdata
++#  define __devexit
++#  define __devexit_p(x) x
++#endif
++
+ /*! Default chunk size for conferences and such -- static right now, might make
+    variable sometime.  8 samples = 1 ms = most frequent service interval possible
+    for a USB device */
+-- 
+1.7.10.4
+

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=10083&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Jan 28 14:08:17 2013
@@ -3,3 +3,4 @@
 no_firmware_download
 chanmute
 notest
+fix_define_dev