Merge branch 'linus' into cpus4096

[linux-2.6] / drivers / mtd / nand / cs553x_nand.c

diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 8dab69657b1914eefb5ebb0eebf1420f2b78edba..3370a800fd3612fd43f6bb54d4cf8a36cbdf2f14 100644 (file)
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -279,7 +279,7 @@ static int is_geode(void)
 
 
 #ifdef CONFIG_MTD_PARTITIONS
-const char *part_probes[] = { "cmdlinepart", NULL };
+static const char *part_probes[] = { "cmdlinepart", NULL };
 #endif