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 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-stmp3xxx
/
dma.c
diff --git
a/arch/arm/plat-stmp3xxx/dma.c
b/arch/arm/plat-stmp3xxx/dma.c
index ef88f25fb870edac8424254161232da10f86fac2..b4dcf8c0477d9ef95a44a50d0848a6ebb12ae60b 100644
(file)
--- a/
arch/arm/plat-stmp3xxx/dma.c
+++ b/
arch/arm/plat-stmp3xxx/dma.c
@@
-15,6
+15,7
@@
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
+#include <linux/gfp.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/dmapool.h>