From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Linux Kernel List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>, Linus Torvalds <torvalds@osdl.org>
Subject: Re: 2.6.10-rc2: parport_pc is broken
Date: Tue, 16 Nov 2004 22:52:24 +0000 [thread overview]
Message-ID: <20041116225224.I22425@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20041116125842.A20648@flint.arm.linux.org.uk>; from rmk+lkml@arm.linux.org.uk on Tue, Nov 16, 2004 at 12:58:43PM +0000
The following patch fixes these build errors on machines with CONFIG_PCI=n:
drivers/parport/parport_pc.c:3199: error: `parport_init_mode' undeclared (first use in this function)
drivers/parport/parport_pc.c:3199: error: (Each undeclared identifier is reported only once
drivers/parport/parport_pc.c:3199: error: for each function it appears in.)
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c
--- orig/drivers/parport/parport_pc.c Mon Nov 15 09:16:18 2004
+++ linux/drivers/parport/parport_pc.c Tue Nov 16 22:48:22 2004
@@ -3154,6 +3154,7 @@ static int __init parport_parse_dma(cons
PARPORT_DMA_NONE, PARPORT_DMA_NOFIFO);
}
+#ifdef CONFIG_PCI
static int __init parport_init_mode_setup(const char *str) {
printk(KERN_DEBUG "parport_pc.c: Specified parameter parport_init_mode=%s\n", str);
@@ -3170,6 +3171,7 @@ static int __init parport_init_mode_setu
parport_init_mode=5;
return 1;
}
+#endif
#ifdef MODULE
static const char *irq[PARPORT_PC_MAX_PORTS];
@@ -3189,16 +3191,20 @@ module_param_array(dma, charp, NULL, 0);
MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialisation");
module_param(verbose_probing, int, 0644);
#endif
+#ifdef CONFIG_PCI
MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)");
MODULE_PARM(init_mode, "s");
+#endif
static int __init parse_parport_params(void)
{
unsigned int i;
int val;
+#ifdef CONFIG_PCI
if (init_mode)
parport_init_mode_setup(init_mode);
+#endif
for (i = 0; i < PARPORT_PC_MAX_PORTS && io[i]; i++) {
if (parport_parse_irq(irq[i], &val))
@@ -3313,9 +3319,9 @@ __setup ("parport=", parport_setup);
*
* parport_init_mode=[spp|ps2|epp|ecp|ecpepp]
*/
-
+#ifdef CONFIG_PCI
__setup("parport_init_mode=",parport_init_mode_setup);
-
+#endif
#endif
/* "Parser" ends here */
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
prev parent reply other threads:[~2004-11-16 22:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-16 12:58 2.6.10-rc2: parport_pc is broken Russell King
2004-11-16 13:46 ` Al Viro
2004-11-16 22:52 ` Russell King [this message]
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=20041116225224.I22425@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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