Commit 63c6e54a authored by Russell King's avatar Russell King Committed by Linus Torvalds

[PATCH] parport_pc CONFIG_PCI=n build fix

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: default avatarRussell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d57d1fc7
...@@ -3154,6 +3154,7 @@ static int __init parport_parse_dma(const char *dmastr, int *val) ...@@ -3154,6 +3154,7 @@ static int __init parport_parse_dma(const char *dmastr, int *val)
PARPORT_DMA_NONE, PARPORT_DMA_NOFIFO); PARPORT_DMA_NONE, PARPORT_DMA_NOFIFO);
} }
#ifdef CONFIG_PCI
static int __init parport_init_mode_setup(const char *str) { static int __init parport_init_mode_setup(const char *str) {
printk(KERN_DEBUG "parport_pc.c: Specified parameter parport_init_mode=%s\n", 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_setup(const char *str) { ...@@ -3170,6 +3171,7 @@ static int __init parport_init_mode_setup(const char *str) {
parport_init_mode=5; parport_init_mode=5;
return 1; return 1;
} }
#endif
#ifdef MODULE #ifdef MODULE
static const char *irq[PARPORT_PC_MAX_PORTS]; static const char *irq[PARPORT_PC_MAX_PORTS];
...@@ -3189,16 +3191,20 @@ module_param_array(dma, charp, NULL, 0); ...@@ -3189,16 +3191,20 @@ module_param_array(dma, charp, NULL, 0);
MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialisation"); MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialisation");
module_param(verbose_probing, int, 0644); module_param(verbose_probing, int, 0644);
#endif #endif
#ifdef CONFIG_PCI
MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)"); MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)");
MODULE_PARM(init_mode, "s"); MODULE_PARM(init_mode, "s");
#endif
static int __init parse_parport_params(void) static int __init parse_parport_params(void)
{ {
unsigned int i; unsigned int i;
int val; int val;
#ifdef CONFIG_PCI
if (init_mode) if (init_mode)
parport_init_mode_setup(init_mode); parport_init_mode_setup(init_mode);
#endif
for (i = 0; i < PARPORT_PC_MAX_PORTS && io[i]; i++) { for (i = 0; i < PARPORT_PC_MAX_PORTS && io[i]; i++) {
if (parport_parse_irq(irq[i], &val)) if (parport_parse_irq(irq[i], &val))
...@@ -3313,9 +3319,9 @@ __setup ("parport=", parport_setup); ...@@ -3313,9 +3319,9 @@ __setup ("parport=", parport_setup);
* *
* parport_init_mode=[spp|ps2|epp|ecp|ecpepp] * parport_init_mode=[spp|ps2|epp|ecp|ecpepp]
*/ */
#ifdef CONFIG_PCI
__setup("parport_init_mode=",parport_init_mode_setup); __setup("parport_init_mode=",parport_init_mode_setup);
#endif
#endif #endif
/* "Parser" ends here */ /* "Parser" ends here */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment