Merge git://git.infradead.org/~dwmw2/cafe-2.6

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

diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index a7a7bfe33879e0cc56bb07d25e4b23b7302b65f7..3402ce448702bfa897bd9f9e4468c1e5e16b9324 100644 (file)
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -346,7 +346,7 @@ static int parse_cmdline_partitions(struct mtd_info *master,
  *
  * This function needs to be visible for bootloaders.
  */
-int mtdpart_setup(char *s)
+static int mtdpart_setup(char *s)
 {
        cmdline = s;
        return 1;