From: William Lee Irwin III <wli@holomorphy.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org
Subject: [7/8] fix unresolved MTD symbols in scx200_docflash.c
Date: Mon, 3 Jan 2005 09:45:21 -0800 [thread overview]
Message-ID: <20050103174521.GI29332@holomorphy.com> (raw)
In-Reply-To: <20050103173952.GH29332@holomorphy.com>
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@holomorphy.com>
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);
next prev parent reply other threads:[~2005-01-03 17:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-03 17:20 [0/8] patches vs. 2.6.10-mm1 William Lee Irwin III
2005-01-03 17:23 ` [1/8] there is no generic_file_(get|set)_policy() William Lee Irwin III
2005-01-03 17:26 ` [2/8] kill quota_v2.c printk() of size_t warning William Lee Irwin III
2005-01-03 17:28 ` [3/8] kill gen_init_cpio.c " William Lee Irwin III
2005-01-03 17:31 ` [4/8] fix arch/x86_64/ia32/syscall32.c misdeclared pud variable William Lee Irwin III
2005-01-03 17:34 ` William Lee Irwin III
2005-01-03 17:36 ` [5/8] silence numerous size_t warnings in drivers/acpi/processor_idle.c William Lee Irwin III
2005-01-03 17:39 ` [6/8] make IRDA string tables conditional on CONFIG_IRDA_DEBUG William Lee Irwin III
2005-01-03 17:45 ` William Lee Irwin III [this message]
2005-01-03 17:47 ` [8/8] fix module_param() type mismatch in drivers/char/n_hdlc.c William Lee Irwin III
2005-01-03 18:11 ` William Lee Irwin III
2005-01-03 17:42 ` [3/8] kill gen_init_cpio.c printk() of size_t warning linux-os
2005-01-03 17:59 ` Jeff Garzik
2005-01-03 18:09 ` William Lee Irwin III
2005-01-03 18:33 ` linux-os
2005-01-03 21:09 ` H. Peter Anvin
2005-01-03 21:36 ` William Lee Irwin III
2005-01-03 21:41 ` H. Peter Anvin
2005-01-03 22:03 ` linux-os
2005-01-03 21:55 ` Al Viro
2005-01-03 22:09 ` William Lee Irwin III
2005-01-03 23:03 ` Ben Pfaff
2005-01-03 23:56 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050103174521.GI29332@holomorphy.com \
--to=wli@holomorphy.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox