From 368d8bec4bad1a6cf2eb5070b0cd884b6c2ed0f7 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Mon, 2 Mar 2015 18:33:35 +0200 Subject: [PATCH] xpp: module_refcount is back to int on 3.19 Commit d5db139ab3764640e0882a1746e7b9fdee33fd87 "module: make module_refcount() a signed integer." included in 3.19 makes this condition slightly more complex. Signed-off-by: Tzafrir Cohen (cherry picked from commit 5c072d5bce2df7f93ce52af334e60a8eee79ecb6) --- drivers/dahdi/xpp/xproto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dahdi/xpp/xproto.c b/drivers/dahdi/xpp/xproto.c index 25618fa..1fd130c 100644 --- a/drivers/dahdi/xpp/xproto.c +++ b/drivers/dahdi/xpp/xproto.c @@ -80,7 +80,8 @@ static const xproto_table_t *xproto_table(xpd_type_t cardtype) return xprotocol_tables[cardtype]; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) || \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) #define MODULE_REFCOUNT_FORMAT "%s refcount was %d\n" #else #define MODULE_REFCOUNT_FORMAT "%s refcount was %lu\n"