From: Adrian Bunk <bunk@fs.tum.de>
To: Andrew Morton <akpm@osdl.org>,
Jes Sorensen <jes@trained-monkey.org>,
Christoph Hellwig <hch@infradead.org>
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [patch] 2.6.1-rc2-mm1: qla1280.c doesn't compile
Date: Fri, 9 Jan 2004 02:52:30 +0100 [thread overview]
Message-ID: <20040109015229.GK13867@fs.tum.de> (raw)
In-Reply-To: <20040107232831.13261f76.akpm@osdl.org>
On Wed, Jan 07, 2004 at 11:28:31PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.1-rc1-mm2:
>...
> -qla1280-update.patch
> +qla1280-update-2.patch
>
> Updated qlogic patch
>...
I got the following compile error when trying to compile this driver
statically into a kernel with hotplug enabled:
<-- snip -->
...
drivers/scsi/qla1280.c:4849: error: `qla1280_remove_one' undeclared here
(not in a function)
drivers/scsi/qla1280.c:4849: error: initializer element is not constant
drivers/scsi/qla1280.c:4849: error: (near initialization for
`qla1280_pci_driver.remove')
make[2]: *** [drivers/scsi/qla1280.o] Error 1
<-- snip -->
Since I don't see a good reason why qla1280_remove_one is #ifdef'ed out
in the non-modular case the patch below fixes this problem by removing
two #ifdef's.
cu
Adrian
--- linux-2.6.1-rc2-mm1/drivers/scsi/qla1280.c.old 2004-01-08 22:40:54.000000000 +0100
+++ linux-2.6.1-rc2-mm1/drivers/scsi/qla1280.c 2004-01-08 22:42:46.000000000 +0100
@@ -480,9 +480,7 @@
#endif
static int qla1280_probe_one(struct pci_dev *, const struct pci_device_id *);
-#if defined(CONFIG_SCSI_QLOGIC_1280_MODULE) || (LINUX_VERSION_CODE < 0x020600)
static void qla1280_remove_one(struct pci_dev *);
-#endif
/*
* QLogic Driver Support Function Prototypes.
@@ -4807,7 +4805,6 @@
}
-#if defined(CONFIG_SCSI_QLOGIC_1280_MODULE) || (LINUX_VERSION_CODE < 0x020600)
static void __devexit
qla1280_remove_one(struct pci_dev *pdev)
{
@@ -4839,7 +4836,6 @@
scsi_host_put(host);
}
-#endif
#if LINUX_VERSION_CODE >= 0x020600
static struct pci_driver qla1280_pci_driver = {
next parent reply other threads:[~2004-01-09 1:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20040107232831.13261f76.akpm@osdl.org>
2004-01-09 1:52 ` Adrian Bunk [this message]
2004-01-09 13:49 ` [patch] 2.6.1-rc2-mm1: qla1280.c doesn't compile Christoph Hellwig
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=20040109015229.GK13867@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=jes@trained-monkey.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@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