git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-radeon-evergreen-accel' into drm-core-next
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
pci-dma.c
diff --git
a/arch/parisc/kernel/pci-dma.c
b/arch/parisc/kernel/pci-dma.c
index
c07f618
..
a029f74
100644
(file)
--- a/
arch/parisc/kernel/pci-dma.c
+++ b/
arch/parisc/kernel/pci-dma.c
@@
-18,11
+18,11
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
+#include <linux/gfp.h>
#include <linux/mm.h>
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/mm.h>
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/scatterlist.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/scatterlist.h>