Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / linux / mtd / plat-ram.h

diff --git a/include/linux/mtd/plat-ram.h b/include/linux/mtd/plat-ram.h
index 9667863bd7e3c95496bf0cd0b47e1e589b5ed9ca..e07890aff1cf9523cb0fe4d07b0c06353da046c9 100644 (file)
--- a/include/linux/mtd/plat-ram.h
+++ b/include/linux/mtd/plat-ram.h
@@ -6,8 +6,6 @@
  *
  * Generic platform device based RAM map
  *
- * $Id: plat-ram.h,v 1.2 2005/01/24 00:37:40 bjd Exp $
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -21,8 +19,9 @@
 #define PLATRAM_RW (1)
 
 struct platdata_mtd_ram {
-       char                    *mapname;
-       char                   **probes;
+       const char              *mapname;
+       const char              **map_probes;
+       const char              **probes;
        struct mtd_partition    *partitions;
        int                      nr_partitions;
        int                      bankwidth;