[zaptel-commits] tzafrir: trunk r2152 - in /trunk: ./ xpp/xbus-core.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Sun Feb 11 09:53:46 2007
New Revision: 2152

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

........
r2151 | tzafrir | 2007-02-11 17:48:01 +0200 (Sun, 11 Feb 2007) | 3 lines

struct inode and debugfs: break some Fedoras rather than all others.
(from changeset 2150)

........

Modified:
    trunk/   (props changed)
    trunk/xpp/xbus-core.c

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

Modified: trunk/xpp/xbus-core.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xbus-core.c?view=diff&rev=2152&r1=2151&r2=2152
==============================================================================
--- trunk/xpp/xbus-core.c (original)
+++ trunk/xpp/xbus-core.c Sun Feb 11 09:53:46 2007
@@ -157,10 +157,10 @@
 /*
  * As part of the "inode diet" the private data member of struct inode
  * has changed in 2.6.19. However, Fedore Core 6 adopted this change
- * a bit earlier (2.6.18). If you use vanila kernel (or Debian Etch)
- * Change the following test from 2,6,18 to 2,6,19.
+ * a bit earlier (2.6.18). If you use such a kernel, Change the 
+ * following test from 2,6,19 to 2,6,18.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 #define	I_PRIVATE(inode)	((inode)->u.generic_ip)
 #else
 #define	I_PRIVATE(inode)	((inode)->i_private)