summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/dsp_pipeline.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-04-23 14:30:22 +0200
committerRobert Richter <robert.richter@amd.com>2010-04-23 14:30:22 +0200
commita36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch)
treec5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/isdn/mISDN/dsp_pipeline.c
parentoprofile: convert oprofile from timer_hook to hrtimer (diff)
parentLinux 2.6.34-rc5 (diff)
downloadlinux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.xz
linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.zip
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/isdn/mISDN/dsp_pipeline.c')
-rw-r--r--drivers/isdn/mISDN/dsp_pipeline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index e9941678edfa..621f31007095 100644
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -25,6 +25,7 @@
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/list.h>
#include <linux/string.h>
#include <linux/mISDNif.h>