summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/lubbock-flash.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-31 19:51:57 +0100
committerTony Luck <tony.luck@intel.com>2005-10-31 19:51:57 +0100
commitc7fb577e2a6cb04732541f2dc402bd46747f7558 (patch)
treedf3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /drivers/mtd/maps/lubbock-flash.c
parentUpdate from upstream with manual merge of Yasunori Goto's (diff)
parent[PATCH] noop-iosched: avoid corrupted request merging (diff)
downloadlinux-c7fb577e2a6cb04732541f2dc402bd46747f7558.tar.xz
linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.zip
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4 to new location of swiotlb.c Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/mtd/maps/lubbock-flash.c')
-rw-r--r--drivers/mtd/maps/lubbock-flash.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 1298de475c9a..2337e0c46750 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -15,10 +15,13 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <linux/dma-mapping.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>