Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / mtd / devices / mtdram.c

diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index ec59d65897fbe38976112ab071741b6c2d3b9189..8e285089229c364ee29c6b4f7c90a872d6e7c693 100644 (file)
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -92,7 +92,7 @@ static void __exit cleanup_mtdram(void)
 }
 
 int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
-               unsigned long size, char *name)
+               unsigned long size, const char *name)
 {
        memset(mtd, 0, sizeof(*mtd));