smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
PATCH 1/1 smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
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 <[email protected]>
drivers/net/irda/smsc-ircc2.c +12 -2
@@ -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 255static 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 +/******************************************************************************* *