The patch titled nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP has been removed from the -mm tree. Its filename was nsc-ircc-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: nsc-ircc: 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/nsc-ircc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff -puN drivers/net/irda/nsc-ircc.c~nsc-ircc-wrap-pnp-probe-code-in-ifdef-config_pnp drivers/net/irda/nsc-ircc.c --- a/drivers/net/irda/nsc-ircc.c~nsc-ircc-wrap-pnp-probe-code-in-ifdef-config_pnp +++ a/drivers/net/irda/nsc-ircc.c @@ -100,7 +100,6 @@ static int nsc_ircc_probe_39x(nsc_chip_t static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info); static int nsc_ircc_init_338(nsc_chip_t *chip, chipio_t *info); static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info); -static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id); /* These are the known NSC chips */ static nsc_chip_t chips[] = { @@ -145,8 +144,10 @@ static char *dongle_types[] = { "No dongle connected", }; -/* PNP probing */ static chipio_t pnp_info; + +#ifdef CONFIG_PNP +/* PNP probing */ static const struct pnp_device_id nsc_ircc_pnp_table[] = { { .id = "NSC6001", .driver_data = 0 }, { .id = "IBM0071", .driver_data = 0 }, @@ -155,11 +156,16 @@ static const struct pnp_device_id nsc_ir MODULE_DEVICE_TABLE(pnp, nsc_ircc_pnp_table); +static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id); + static struct pnp_driver nsc_ircc_pnp_driver = { .name = "nsc-ircc", .id_table = nsc_ircc_pnp_table, .probe = nsc_ircc_pnp_probe, }; +#else +static struct pnp_driver nsc_ircc_pnp_driver; +#endif /* Some prototypes */ static int nsc_ircc_open(chipio_t *info); @@ -916,6 +922,7 @@ static int nsc_ircc_probe_39x(nsc_chip_t return 0; } +#ifdef CONFIG_PNP /* PNP probing */ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) { @@ -952,6 +959,7 @@ static int nsc_ircc_pnp_probe(struct pnp return 0; } +#endif /* * Function nsc_ircc_setup (info) _ 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