diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/mtd/onenand/omap2.c | |
| parent | sparc64: Fix memory leak in pci_register_iommu_region(). (diff) | |
| parent | Linux 2.6.34-rc4 (diff) | |
| download | linux-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz linux-9343af084c7e8911897b0883042ee690cee3aaef.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/mtd/onenand/omap2.c')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 75f38b95811e..fd406348fdfd 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -34,6 +34,7 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/io.h> +#include <linux/slab.h> #include <asm/mach/flash.h> #include <plat/gpmc.h> |