[zaptel-commits] kpfleming: trunk r2106 - in /trunk: ./ zttranscode.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb  7 13:56:37 2007
New Revision: 2106

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2106
Log:
Merged revisions 2105 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2105 | kpfleming | 2007-02-07 13:55:41 -0600 (Wed, 07 Feb 2007) | 10 lines

Merged revisions 2103 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2103 | kpfleming | 2007-02-07 13:52:29 -0600 (Wed, 07 Feb 2007) | 2 lines

include headers we need... new kernel releases won't do it for us

........

................

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Feb  7 13:56:37 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099,2105

Modified: trunk/zttranscode.c
URL: http://svn.digium.com/view/zaptel/trunk/zttranscode.c?view=diff&rev=2106&r1=2105&r2=2106
==============================================================================
--- trunk/zttranscode.c (original)
+++ trunk/zttranscode.c Wed Feb  7 13:56:37 2007
@@ -33,6 +33,8 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/mm.h>
+#include <linux/page-flags.h>
 #include <asm/io.h>
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>