From 53f5a7fa85011d8d602a4b36725735ce89ccfe46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toralf=20F=C3=B6rster?= Date: Mon, 26 May 2008 20:35:46 +0200 Subject: [PATCH] --- yaml --- r: 106403 b: refs/heads/master c: 437d0d299f0e08954c3cb680221d7e888e1a857f h: refs/heads/master i: 106401: 8af107be92744bb23e341f9eab100c43e65bbf11 106399: d2254bea3abe845b49168d130afcc62a635891f1 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/cafe_nand.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0cfa728f63e2..7989894ff2aa 100644 --- 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 index da6ceaa80ba1..95345d051579 100644 --- 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... */