summaryrefslogtreecommitdiff
path: root/drivers/isdn/hisax/icc.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-04-23 16:30:22 +0400
committerRobert Richter <robert.richter@amd.com>2010-04-23 16:30:22 +0400
commita36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch)
treec5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/isdn/hisax/icc.c
parentbc078e4eab65f11bbaeed380593ab8151b30d703 (diff)
parent01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff)
downloadlinux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.xz
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/isdn/hisax/icc.c')
-rw-r--r--drivers/isdn/hisax/icc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index c80cbb8a2ef9..63057268cc3d 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -20,6 +20,7 @@
// #include "arcofi.h"
#include "isdnl1.h"
#include <linux/interrupt.h>
+#include <linux/slab.h>
#define DBUSY_TIMER_VALUE 80
#define ARCOFI_USE 0