git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mx3
/
mach-mx31moboard.c
diff --git
a/arch/arm/mach-mx3/mach-mx31moboard.c
b/arch/arm/mach-mx3/mach-mx31moboard.c
index a7dc5191bf5ea4de9ffaf09bc0397414ddd80745..fccb9207b78d75112bed0b7ac0d3d45a17367e1b 100644
(file)
--- a/
arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/
arch/arm/mach-mx3/mach-mx31moboard.c
@@
-19,6
+19,7
@@
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/fsl_devices.h>
+#include <linux/gfp.h>
#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/interrupt.h>