The patch titled re-add CONFIG_SOUND_SSCAPE has been added to the -mm tree. Its filename is re-add-config_sound_sscape.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: re-add CONFIG_SOUND_SSCAPE From: Adrian Bunk <bunk@xxxxxxxxx> Due to a regression in the correcponding ALSA driver (ALSA #2234), the OSS driver should stay until it's fixed. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- sound/oss/Kconfig | 13 +++++++++++++ 1 files changed, 13 insertions(+) diff -puN sound/oss/Kconfig~re-add-config_sound_sscape sound/oss/Kconfig --- a/sound/oss/Kconfig~re-add-config_sound_sscape +++ a/sound/oss/Kconfig @@ -493,6 +493,19 @@ config SOUND_CS4232 See <file:Documentation/sound/oss/CS4232> for more information on configuring this card. +config SOUND_SSCAPE + tristate "Ensoniq SoundScape support" + depends on SOUND_OSS + help + Answer Y if you have a sound card based on the Ensoniq SoundScape + chipset. Such cards are being manufactured at least by Ensoniq, Spea + and Reveal (Reveal makes also other cards). + + If you compile the driver into the kernel, you have to add + "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command + line. + + config SOUND_VMIDI tristate "Loopback MIDI device support" depends on SOUND_OSS _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch fix-sgivwfb-compile.patch git-acpi.patch drivers-acpi-scanc-make-acpi_bus_type-static.patch git-agpgart.patch the-scheduled-unexport-of-insert_resource.patch git-gfs2.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch fs-jffs2-make-2-functions-static.patch ni5010-netcard-cleanup-fix.patch drivers-dma-iovlockc-make-num_pages_spanned-static.patch drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch git-ocfs2.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-qla2xxx-make-more-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-arcmsr-cleanups.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch acx1xx-wireless-driver.patch arch-i386-mach-visws-setupc-remove-dummy-function-calls.patch fs-ecryptfs-possible-cleanups.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-implement-clone_newuts-flag-tidy.patch task-watchers-register-semundo-task-watcher-cleanup.patch fs-reiser4-possible-cleanups.patch drivers-ide-legacy-ide-csc-make-2-functions-static.patch drivers-md-raid5c-remove-an-unused-variable.patch lockdep-core-cleanups.patch srcu-add-srcu-operations-to-rcutorture-tidy-2.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch re-add-config_sound_sscape.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