Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b9a396 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9396d496

drivers/parport/parport_pc.c

+4 −0
Original line number Diff line number Diff line
@@ -3082,6 +3082,7 @@ static struct pci_driver parport_pc_pci_driver; 
static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;}

#endif /* CONFIG_PCI */



#ifdef CONFIG_PNP



static const struct pnp_device_id parport_pc_pnp_tbl[] = {

	/* Standard LPT Printer Port */
@@ -3148,6 +3149,9 @@ static struct pnp_driver parport_pc_pnp_driver = { 
	.remove		= parport_pc_pnp_remove,

};



#else

static struct pnp_driver parport_pc_pnp_driver;

#endif /* CONFIG_PNP */



static int __devinit parport_pc_platform_probe(struct platform_device *pdev)

{