Merge branch 'ioat' into dmaengine

2010-05-17 16:30:58 -07:00
parent 058276303d caa20d974c
commit 0b28330e39
4782 changed files with 30306 additions and 7951 deletions
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
 #include <linux/delay.h>