summaryrefslogtreecommitdiffstats
path: root/drivers/atm/zatm.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-26 09:08:27 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-04-26 09:08:27 +0200
commite19553427c2e8fdb04fdd98e407164bb59a840ba (patch)
tree5332234b2dad07c03c27e4608afb16f297f41e61 /drivers/atm/zatm.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming... (diff)
parentSH: fix error paths in DMA driver (diff)
downloadlinux-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz
linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.zip
Merge branch 'sh/stable-updates'
Conflicts: arch/sh/kernel/dwarf.c drivers/dma/shdma.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/atm/zatm.c')
-rw-r--r--drivers/atm/zatm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 2e9635be048c..702accec89e9 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -21,6 +21,7 @@
#include <linux/capability.h>
#include <linux/bitops.h>
#include <linux/wait.h>
+#include <linux/slab.h>
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/string.h>