2008-03-27 23:06:18

by Bjorn Helgaas

[permalink] [raw]
Subject: [patch] 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 <[email protected]>

Index: work7/drivers/parport/parport_pc.c
===================================================================
--- work7.orig/drivers/parport/parport_pc.c 2008-03-27 16:10:52.000000000 -0600
+++ work7/drivers/parport/parport_pc.c 2008-03-27 17:01:00.000000000 -0600
@@ -3083,6 +3083,7 @@
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 @@
.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)
{