The patch titled wavefront: only declare isapnp on CONFIG_PNP has been added to the -mm tree. Its filename is wavefront-only-declare-isapnp-on-config_pnp.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: wavefront: only declare isapnp on CONFIG_PNP From: David Rientjes <rientjes@xxxxxxxxxx> isapnp[] is only used for CONFIG_PNP. If this configuration option is not set, do not declare the array. Cc: Adam Belay <ambx1@xxxxxxxxxx> Cc: Jaroslav Kysela <perex@xxxxxxx> Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- sound/isa/wavefront/wavefront.c | 2 ++ 1 files changed, 2 insertions(+) diff -puN sound/isa/wavefront/wavefront.c~wavefront-only-declare-isapnp-on-config_pnp sound/isa/wavefront/wavefront.c --- a/sound/isa/wavefront/wavefront.c~wavefront-only-declare-isapnp-on-config_pnp +++ a/sound/isa/wavefront/wavefront.c @@ -40,7 +40,9 @@ MODULE_SUPPORTED_DEVICE("{{Turtle Beach, static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */ +#ifdef CONFIG_PNP static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; +#endif static long cs4232_pcm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */ static int cs4232_pcm_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15 */ static long cs4232_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */ _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are origin.patch i386-add-ptep_test_and_clear_dirtyyoung.patch i386-use-pte_update_defer-in-ptep_test_and_clear_dirtyyoung.patch smaps-extract-pmd-walker-from-smaps-code.patch smaps-add-pages-referenced-count-to-smaps.patch smaps-add-clear_refs-file-to-clear-reference.patch cpusets-allow-tif_memdie-threads-to-allocate-anywhere.patch mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use.patch oom-fix-constraint-deadlock.patch wavefront-only-declare-isapnp-on-config_pnp.patch git-cpufreq.patch maps2-uninline-some-functions-in-the-page-walker.patch maps2-eliminate-the-pmd_walker-struct-in-the-page-walker.patch maps2-remove-vma-from-args-in-the-page-walker.patch maps2-propagate-errors-from-callback-in-page-walker.patch maps2-add-callbacks-for-each-level-to-page-walker.patch maps2-move-the-page-walker-code-to-lib.patch maps2-simplify-interdependence-of-proc-pid-maps-and-smaps.patch maps2-move-clear_refs-code-to-task_mmuc.patch maps2-regroup-task_mmu-by-interface.patch maps2-make-proc-pid-smaps-optional-under-config_embedded.patch maps2-make-proc-pid-clear_refs-option-under-config_embedded.patch maps2-add-proc-pid-pagemap-interface.patch maps2-add-proc-kpagemap-interface.patch cpusets-allow-empty-cpusmems_allowed-to-be-set-for.patch cpusets-allow-empty-cpusmems_allowed-to-be-set-for-fix.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