Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / mtd / mtd.h

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 31ed234b2a7493293f8ee16359ba9a48ca2bd873..4ed40caff4e58161a8e5d545421e375d0b81f7e2 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -119,7 +119,7 @@ struct mtd_info {
        u_int32_t oobavail;  // Available OOB bytes per block
 
        // Kernel-only stuff starts here.
-       char *name;
+       const char *name;
        int index;
 
        /* ecc layout structure pointer - read only ! */