---

yaml --- r: 106403 b: refs/heads/master c: 437d0d2 h: refs/heads/master i: 106401: 8af107b 106399: d2254be v: v3
git-mirror · Jun 4, 2008 · 53f5a7f · 53f5a7f
1 parent c040f58
commit 53f5a7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b0b30acf3fc76e5d4d278fa5a8c9c6ac9898745
+refs/heads/master: 437d0d299f0e08954c3cb680221d7e888e1a857f
diff --git a/trunk/drivers/mtd/nand/cafe_nand.c b/trunk/drivers/mtd/nand/cafe_nand.c
@@ -626,10 +626,12 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
 {
 	struct mtd_info *mtd;
 	struct cafe_priv *cafe;
-	struct mtd_partition *parts;
 	uint32_t ctrl;
-	int nr_parts;
 	int err = 0;
+#ifdef CONFIG_MTD_PARTITIONS
+	struct mtd_partition *parts;
+	int nr_parts;
+#endif
 
 	/* Very old versions shared the same PCI ident for all three
 	   functions on the chip. Verify the class too... */