diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-03-27 17:07:04 -0600 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-29 19:07:44 +1100 |
commit | 840d0b9b3c408151055ff90650cd6470ca48831f (patch) | |
tree | 1d396d4ed066a4ad71f218cd3c9308180f32c1f1 /drivers | |
parent | 31a0159e8caf42f17e582a59bdb7447193c9bcad (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/parport/parport_pc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index d76d37bcb9cc..be8817904a18 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -3083,6 +3083,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 */ @@ -3149,6 +3150,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) { |