[dahdi-commits] sruffell: linux/trunk r10484 - /linux/trunk/drivers/dahdi/xpp/xpd.h

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Mar 15 10:41:36 2012
New Revision: 10484

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10484
Log:
xpp: Use 'bool' type for boolean module parameters on kernel versions >= 2.6.31.

Eliminates warnings that are a result of upstream commit 72db395ffa
"module_param: check that bool parameters really are bool."

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/xpp/xpd.h

Modified: linux/trunk/drivers/dahdi/xpp/xpd.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xpd.h?view=diff&rev=10484&r1=10483&r2=10484
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpd.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xpd.h Thu Mar 15 10:41:36 2012
@@ -42,6 +42,8 @@
 #include <dahdi/kernel.h>
 
 #ifdef __KERNEL__
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
 /*
  * FIXME: Kludge for 2.6.19
  * bool is now defined as a proper boolean type (gcc _Bool)
@@ -51,6 +53,12 @@
 	int name = init; \
 	module_param(name, bool, perm); \
 	MODULE_PARM_DESC(name, desc " [default " #init "]")
+#else
+#define	DEF_PARM_BOOL(name, init, perm, desc) \
+	bool name = init; \
+	module_param(name, bool, perm); \
+	MODULE_PARM_DESC(name, desc " [default " #init "]")
+#endif
 
 #define	DEF_PARM(type, name, init, perm, desc) \
 	type name = init; \