summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/layer1.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 09:39:43 +0100
committerLen Brown <len.brown@intel.com>2009-01-09 09:39:43 +0100
commitb2576e1d4408e134e2188c967b1f28af39cd79d4 (patch)
tree004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/isdn/mISDN/layer1.c
parentMerge branch 'suspend' into release (diff)
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
downloadlinux-b2576e1d4408e134e2188c967b1f28af39cd79d4.tar.xz
linux-b2576e1d4408e134e2188c967b1f28af39cd79d4.zip
Merge branch 'linus' into release
Diffstat (limited to 'drivers/isdn/mISDN/layer1.c')
-rw-r--r--drivers/isdn/mISDN/layer1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c
index fced1a2755f8..b73e952d12cf 100644
--- a/drivers/isdn/mISDN/layer1.c
+++ b/drivers/isdn/mISDN/layer1.c
@@ -18,10 +18,11 @@
#include <linux/module.h>
#include <linux/mISDNhw.h>
+#include "core.h"
#include "layer1.h"
#include "fsm.h"
-static int *debug;
+static u_int *debug;
struct layer1 {
u_long Flags;