The patch titled
schedule obsolete OSS drivers for removal, 2nd round
has been removed from the -mm tree. Its filename is
schedule-obsolete-oss-drivers-for-removal-2nd-round.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: schedule obsolete OSS drivers for removal, 2nd round
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch schedules obsolete OSS drivers (with ALSA drivers that support
the same hardware) for removal.
A rationale of the patch is in
http://lkml.org/lkml/2006/7/11/186
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
Documentation/feature-removal-schedule.txt | 7 ++++
sound/oss/Kconfig | 30 +++++++++++++------
2 files changed, 29 insertions(+), 8 deletions(-)
diff -puN Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-2nd-round Documentation/feature-removal-schedule.txt
--- a/Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-2nd-round
+++ a/Documentation/feature-removal-schedule.txt
@@ -120,6 +120,13 @@ Who: Adrian Bunk <bunk@xxxxxxxxx>
---------------------------
+What: drivers depending on OSS_OBSOLETE_DRIVER
+When: options in 2.6.20, code in 2.6.22
+Why: OSS drivers with ALSA replacements
+Who: Adrian Bunk <bunk@xxxxxxxxx>
+
+---------------------------
+
What: pci_module_init(driver)
When: January 2007
Why: Is replaced by pci_register_driver(pci_driver).
diff -puN sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-2nd-round sound/oss/Kconfig
--- a/sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-2nd-round
+++ a/sound/oss/Kconfig
@@ -5,6 +5,20 @@
#
# Prompt user for primary drivers.
+config OSS_OBSOLETE_DRIVER
+ bool "Obsolete OSS drivers"
+ depends on SOUND_PRIME
+ help
+ This option enables support for obsolete OSS drivers that
+ are scheduled for removal in the near future since there
+ are ALSA drivers for the same hardware.
+
+ Please contact Adrian Bunk <bunk@xxxxxxxxx> if you had to
+ say Y here because your soundcard is not properly supported
+ by ALSA.
+
+ If unsure, say N.
+
config SOUND_BT878
tristate "BT878 audio dma"
depends on SOUND_PRIME && PCI
@@ -23,7 +37,7 @@ config SOUND_BT878
config SOUND_EMU10K1
tristate "Creative SBLive! (EMU10K1)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER
---help---
Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -49,7 +63,7 @@ config MIDI_EMU10K1
config SOUND_FUSION
tristate "Crystal SoundFusion (CS4280/461x)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER
help
This module drives the Crystal SoundFusion devices (CS4280/46xx
series) when wired as native sound drivers with AC97 codecs. If
@@ -440,7 +454,7 @@ config SOUND_DMAP
config SOUND_AD1816
tristate "AD1816(A) based cards (EXPERIMENTAL)"
- depends on EXPERIMENTAL && SOUND_OSS
+ depends on EXPERIMENTAL && SOUND_OSS && OSS_OBSOLETE_DRIVER
help
Say M here if you have a sound card based on the Analog Devices
AD1816(A) chip.
@@ -450,21 +464,21 @@ config SOUND_AD1816
config SOUND_AD1889
tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)"
- depends on EXPERIMENTAL && SOUND_OSS && PCI
+ depends on EXPERIMENTAL && SOUND_OSS && PCI && OSS_OBSOLETE_DRIVER
help
Say M here if you have a sound card based on the Analog Devices
AD1889 chip.
config SOUND_ADLIB
tristate "Adlib Cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
help
Includes ASB 64 4D. Information on programming AdLib cards is
available at <http://www.itsnet.com/home/ldragon/Specs/adlib.html>.
config SOUND_ACI_MIXER
tristate "ACI mixer (miroSOUND PCM1-pro/PCM12/PCM20)"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
---help---
ACI (Audio Command Interface) is a protocol used to communicate with
the microcontroller on some sound cards produced by miro and
@@ -586,7 +600,7 @@ config SOUND_MPU401
config SOUND_NM256
tristate "NM256AV/NM256ZX audio support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
help
Say M here to include audio support for the NeoMagic 256AV/256ZX
chipsets. These are the audio chipsets found in the Sony
@@ -706,7 +720,7 @@ config SOUND_YM3812
config SOUND_OPL3SA2
tristate "Yamaha OPL3-SA2 and SA3 based PnP cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OSS_OBSOLETE_DRIVER
help
Say Y or M if you have a card based on one of these Yamaha sound
chipsets or the "SAx", which is actually a SA3. Read
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-alsa.patch
drivers-md-kconfig-fix-block-dependency.patch
git-cpufreq.patch
git-drm.patch
git-dvb.patch
git-gfs2.patch
the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch
git-input.patch
git-mtd.patch
git-net.patch
fs-nfs-make-code-static.patch
git-ocfs2.patch
git-pcmcia.patch
drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch
git-scsi-misc.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
include-scsi-libsash-should-include-linux-scatterlisth.patch
git-cryptodev.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
selinux-enable-configuration-of-max-policy-version-improve-security_selinux_policydb_version_max_value-help-texts.patch
avr32-set-kbuild_defconfig.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
drivers-char-scx200_gpioc-make-code-static.patch
drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch
kernel-time-ntpc-possible-cleanups.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
hdaps-add-explicit-hardware-configuration-functions-fix-fix.patch
generic-ioremap_page_range-i386-conversion-fix.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
drivers-ide-cleanups.patch
atyfb-possible-cleanups.patch
fbcon-make-3-functions-static.patch
vt-proper-prototypes-for-some-console-functions.patch
md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
rcu-add-fake-writers-to-rcutorture-tidy.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
--
VGER BF report: U 0.504598
-
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
