projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
drivers
/
mtd
/
nand
/
davinci_nand.c
diff --git
a/drivers/mtd/nand/davinci_nand.c
b/drivers/mtd/nand/davinci_nand.c
index 45bb931c08484bfa4a606e6513a5187d6d2728af..9c9d893affeb45da9712605892cda59cb8d871fa 100644
(file)
--- a/
drivers/mtd/nand/davinci_nand.c
+++ b/
drivers/mtd/nand/davinci_nand.c
@@
-32,6
+32,7
@@
#include <linux/io.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
+#include <linux/slab.h>
#include <mach/nand.h>