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

2008-07-25 10:40:14 -04:00
parent 30821fee4f d37e6bf68f
commit ff877ea80e
6656 changed files with 513186 additions and 432171 deletions
--- 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 ! */