[7/8] fix unresolved MTD symbols in scx200_docflash.c

[William Lee Irwin III]

This driver is using some private #ifdef to try to control the use of
partitions and calling functions that get compiled out of the kernel
if it's set (which it is by default). This results in unresolved module
symbols, which are bad.

This patch synchronizes the conditional compilation of partition
management in the driver with the global config option for MTD
partition management and thereby fixes the unresolved symbol problem.

Signed-off-by: William Irwin <wli@xxxxxxxxxxxxxx>

Index: mm1-2.6.10/drivers/mtd/maps/scx200_docflash.c
===================================================================
--- mm1-2.6.10.orig/drivers/mtd/maps/scx200_docflash.c	2005-01-03 06:46:06.000000000 -0800
+++ mm1-2.6.10/drivers/mtd/maps/scx200_docflash.c	2005-01-03 08:25:39.000000000 -0800
@@ -26,9 +26,6 @@
 MODULE_DESCRIPTION("NatSemi SCx200 DOCCS Flash Driver");
 MODULE_LICENSE("GPL");
 
-/* Set this to one if you want to partition the flash */
-#define PARTITION 1
-
 static int probe = 0;		/* Don't autoprobe */
 static unsigned size = 0x1000000; /* 16 MiB the whole ISA address space */
 static unsigned width = 8;	/* Default to 8 bits wide */
@@ -50,7 +47,7 @@
 
 static struct mtd_info *mymtd;
 
-#if PARTITION
+#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition partition_info[] = {
 	{ 
 		.name   = "DOCCS Boot kernel", 
@@ -200,7 +197,7 @@
 
 	mymtd->owner = THIS_MODULE;
 
-#if PARTITION
+#ifdef CONFIG_MTD_PARTITIONS
 	partition_info[3].offset = mymtd->size-partition_info[3].size;
 	partition_info[2].size = partition_info[3].offset-partition_info[2].offset;
 	add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
@@ -213,7 +210,7 @@
 static void __exit cleanup_scx200_docflash(void)
 {
 	if (mymtd) {
-#if PARTITION
+#ifdef CONFIG_MTD_PARTITIONS
 		del_mtd_partitions(mymtd);
 #else
 		del_mtd_device(mymtd);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/