[svn-commits] sruffell: branch linux/2.5 r10117 - /linux/branches/2.5/include/dahdi/kernel.h

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Aug 11 14:56:25 CDT 2011


Author: sruffell
Date: Thu Aug 11 14:56:22 2011
New Revision: 10117

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10117
Log:
dahdi: Define HAVE_NET_DEVICE_OPS on kernels > 2.6.29

HAVE_NET_DEVICE_OPS was defined in the mainline kernel in commit
47fd5b83 which was first released in 2.6.29. Any kernels after that will
have those fields defined.

Mainline commit e2270ea62ae4d7a removed the feature test macros, so
the easiest thing to do is define HAVE_NET_DEVICE_OPS ourselves on the
kernels since it was committed.

This change is needed to compile against the 3.1 kernel.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10109

Modified:
    linux/branches/2.5/include/dahdi/kernel.h

Modified: linux/branches/2.5/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/include/dahdi/kernel.h?view=diff&rev=10117&r1=10116&r2=10117
==============================================================================
--- linux/branches/2.5/include/dahdi/kernel.h (original)
+++ linux/branches/2.5/include/dahdi/kernel.h Thu Aug 11 14:56:22 2011
@@ -67,6 +67,10 @@
 #define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
 #else
 #define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define HAVE_NET_DEVICE_OPS
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)




More information about the svn-commits mailing list