Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / s3c2410.c

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index bf2325df80c71d19e3a504e67dd42acb3fed9ffd..2df5e47d1f5ce2ec7c16a9ab6018d7e4be6c1eff 100644 (file)
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -51,6 +51,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>