Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP

Wrap PNP probe code in #ifdef CONFIG_PNP. We already do the same for
CONFIG_PCI.

Without this change, we'll have unresolved references to pnp_get_resource()
function when CONFIG_PNP=n. (This is a new interface that's not in mainline
yet.)

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Bjorn Helgaas and committed by
Linus Torvalds
f2b9a396 9396d496

+4
+4
drivers/parport/parport_pc.c
··· 3082 3082 static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;} 3083 3083 #endif /* CONFIG_PCI */ 3084 3084 3085 + #ifdef CONFIG_PNP 3085 3086 3086 3087 static const struct pnp_device_id parport_pc_pnp_tbl[] = { 3087 3088 /* Standard LPT Printer Port */ ··· 3149 3148 .remove = parport_pc_pnp_remove, 3150 3149 }; 3151 3150 3151 + #else 3152 + static struct pnp_driver parport_pc_pnp_driver; 3153 + #endif /* CONFIG_PNP */ 3152 3154 3153 3155 static int __devinit parport_pc_platform_probe(struct platform_device *pdev) 3154 3156 {