summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/omap-toto-flash.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 13:37:12 +1100
committerPaul Mackerras <paulus@samba.org>2005-10-31 13:37:12 +1100
commit23fd07750a789a66fe88cf173d52a18f1a387da4 (patch)
tree06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/mtd/maps/omap-toto-flash.c
parentbd787d438a59266af3c9f6351644c85ef1dd21fe (diff)
parented28f96ac1960f30f818374d65be71d2fdf811b0 (diff)
downloadop-kernel-dev-23fd07750a789a66fe88cf173d52a18f1a387da4.zip
op-kernel-dev-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.gz
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/mtd/maps/omap-toto-flash.c')
-rw-r--r--drivers/mtd/maps/omap-toto-flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c
index 4961090..da36e8d 100644
--- a/drivers/mtd/maps/omap-toto-flash.c
+++ b/drivers/mtd/maps/omap-toto-flash.c
@@ -12,9 +12,9 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
OpenPOWER on IntegriCloud