summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/fsldma.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-09-20 07:48:00 +0400
committerJ. Bruce Fields <bfields@redhat.com>2010-09-20 07:48:32 +0400
commitc88739b373e4930ed082a607cb78bf82616fd076 (patch)
tree251d969aa816dab5a62e6b36208b189b37de6534 /arch/powerpc/include/asm/fsldma.h
parent3211af1119174fbe8b676422b74870cdd51d7314 (diff)
parent827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff)
downloadlinux-c88739b373e4930ed082a607cb78bf82616fd076.tar.xz
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'arch/powerpc/include/asm/fsldma.h')
-rw-r--r--arch/powerpc/include/asm/fsldma.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/fsldma.h b/arch/powerpc/include/asm/fsldma.h
index a67aeed17d40..debc5ed96d6e 100644
--- a/arch/powerpc/include/asm/fsldma.h
+++ b/arch/powerpc/include/asm/fsldma.h
@@ -11,6 +11,7 @@
#ifndef __ARCH_POWERPC_ASM_FSLDMA_H__
#define __ARCH_POWERPC_ASM_FSLDMA_H__
+#include <linux/slab.h>
#include <linux/dmaengine.h>
/*