The patch titled smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP has been removed from the -mm tree. Its filename was smsc-ircc2-wrap-pnp-probe-code-in-ifdef-config_pnp.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP From: Bjorn Helgaas <bjorn.helgaas@xxxxxx> 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@xxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx> Cc: Samuel Ortiz <samuel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/irda/smsc-ircc2.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff -puN drivers/net/irda/smsc-ircc2.c~smsc-ircc2-wrap-pnp-probe-code-in-ifdef-config_pnp drivers/net/irda/smsc-ircc2.c --- a/drivers/net/irda/smsc-ircc2.c~smsc-ircc2-wrap-pnp-probe-code-in-ifdef-config_pnp +++ a/drivers/net/irda/smsc-ircc2.c @@ -79,9 +79,13 @@ MODULE_AUTHOR("Daniele Peri <peri@xxxxxx 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 @@ static inline void register_bank(int iob 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 @@ static const struct pnp_device_id smsc_i }; 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 @@ static struct pnp_driver smsc_ircc_pnp_d .probe = smsc_ircc_pnp_probe, }; +#else +static struct pnp_driver smsc_ircc_pnp_driver; +#endif + /******************************************************************************* * _ Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are origin.patch linux-next.patch pnp-fix-missing-kernel-doc-notation.patch acpi_pm_device_sleep_state-cleanup.patch acpi-fix-drivers-acpi-gluec-build-error.patch mm-only-enforce-acpi-resource-conflict-checks.patch pnp-set-irq-index-in-sysfs-set-irq-interface.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html