mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [patch] smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
@ 2008-03-28 16:53 Bjorn Helgaas
  0 siblings, 0 replies; only message in thread
From: Bjorn Helgaas @ 2008-03-28 16:53 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Stephen Rothwell, Kamalesh Babulal, linux-kernel, Samuel Ortiz,
	irda-users, linux-next

Wrap PNP probe code in #ifdef CONFIG_PNP.

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>

Index: work7/drivers/net/irda/smsc-ircc2.c
===================================================================
--- work7.orig/drivers/net/irda/smsc-ircc2.c	2008-03-28 10:47:07.000000000 -0600
+++ work7/drivers/net/irda/smsc-ircc2.c	2008-03-28 10:47:10.000000000 -0600
@@ -79,9 +79,13 @@
 MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
 MODULE_LICENSE("GPL");
 
+#ifdef CONFIG_PNP
 static int smsc_nopnp = 1;
 module_param_named(nopnp, smsc_nopnp, bool, 0);
 MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings, defaults to true");
+#else
+#define smsc_nopnp 1
+#endif
 
 #define DMA_INVAL 255
 static int ircc_dma = DMA_INVAL;
@@ -366,6 +370,10 @@
                iobase + IRCC_MASTER);
 }
 
+static int pnp_driver_registered;
+
+#ifdef CONFIG_PNP
+
 /* PNP hotplug support */
 static const struct pnp_device_id smsc_ircc_pnp_table[] = {
 	{ .id = "SMCf010", .driver_data = 0 },
@@ -374,8 +382,6 @@
 };
 MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table);
 
-static int pnp_driver_registered;
-
 static int __init smsc_ircc_pnp_probe(struct pnp_dev *dev,
 				      const struct pnp_device_id *dev_id)
 {
@@ -403,6 +409,10 @@
 	.probe		= smsc_ircc_pnp_probe,
 };
 
+#else
+static struct pnp_driver smsc_ircc_pnp_driver;
+#endif
+
 
 /*******************************************************************************
  *

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-03-28 16:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-28 16:53 [patch] smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®