diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 7 | ||||
-rw-r--r-- | sound/oss/Kconfig | 30 |
2 files changed, 29 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 87851efb0228..d1cd5f93e028 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -120,6 +120,13 @@ Who: Adrian Bunk <bunk@stusta.de> | |||
120 | 120 | ||
121 | --------------------------- | 121 | --------------------------- |
122 | 122 | ||
123 | What: drivers depending on OSS_OBSOLETE_DRIVER | ||
124 | When: options in 2.6.20, code in 2.6.22 | ||
125 | Why: OSS drivers with ALSA replacements | ||
126 | Who: Adrian Bunk <bunk@stusta.de> | ||
127 | |||
128 | --------------------------- | ||
129 | |||
123 | What: pci_module_init(driver) | 130 | What: pci_module_init(driver) |
124 | When: January 2007 | 131 | When: January 2007 |
125 | Why: Is replaced by pci_register_driver(pci_driver). | 132 | Why: Is replaced by pci_register_driver(pci_driver). |
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 1b7c3dfc2b41..97e38b665587 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -5,6 +5,20 @@ | |||
5 | # | 5 | # |
6 | # Prompt user for primary drivers. | 6 | # Prompt user for primary drivers. |
7 | 7 | ||
8 | config OSS_OBSOLETE_DRIVER | ||
9 | bool "Obsolete OSS drivers" | ||
10 | depends on SOUND_PRIME | ||
11 | help | ||
12 | This option enables support for obsolete OSS drivers that | ||
13 | are scheduled for removal in the near future since there | ||
14 | are ALSA drivers for the same hardware. | ||
15 | |||
16 | Please contact Adrian Bunk <bunk@stusta.de> if you had to | ||
17 | say Y here because your soundcard is not properly supported | ||
18 | by ALSA. | ||
19 | |||
20 | If unsure, say N. | ||
21 | |||
8 | config SOUND_BT878 | 22 | config SOUND_BT878 |
9 | tristate "BT878 audio dma" | 23 | tristate "BT878 audio dma" |
10 | depends on SOUND_PRIME && PCI | 24 | depends on SOUND_PRIME && PCI |
@@ -23,7 +37,7 @@ config SOUND_BT878 | |||
23 | 37 | ||
24 | config SOUND_EMU10K1 | 38 | config SOUND_EMU10K1 |
25 | tristate "Creative SBLive! (EMU10K1)" | 39 | tristate "Creative SBLive! (EMU10K1)" |
26 | depends on SOUND_PRIME && PCI | 40 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER |
27 | ---help--- | 41 | ---help--- |
28 | Say Y or M if you have a PCI sound card using the EMU10K1 chipset, | 42 | Say Y or M if you have a PCI sound card using the EMU10K1 chipset, |
29 | such as the Creative SBLive!, SB PCI512 or Emu-APS. | 43 | such as the Creative SBLive!, SB PCI512 or Emu-APS. |
@@ -49,7 +63,7 @@ config MIDI_EMU10K1 | |||
49 | 63 | ||
50 | config SOUND_FUSION | 64 | config SOUND_FUSION |
51 | tristate "Crystal SoundFusion (CS4280/461x)" | 65 | tristate "Crystal SoundFusion (CS4280/461x)" |
52 | depends on SOUND_PRIME && PCI | 66 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE_DRIVER |
53 | help | 67 | help |
54 | This module drives the Crystal SoundFusion devices (CS4280/46xx | 68 | This module drives the Crystal SoundFusion devices (CS4280/46xx |
55 | series) when wired as native sound drivers with AC97 codecs. If | 69 | series) when wired as native sound drivers with AC97 codecs. If |
@@ -440,7 +454,7 @@ config SOUND_DMAP | |||
440 | 454 | ||
441 | config SOUND_AD1816 | 455 | config SOUND_AD1816 |
442 | tristate "AD1816(A) based cards (EXPERIMENTAL)" | 456 | tristate "AD1816(A) based cards (EXPERIMENTAL)" |
443 | depends on EXPERIMENTAL && SOUND_OSS | 457 | depends on EXPERIMENTAL && SOUND_OSS && OSS_OBSOLETE_DRIVER |
444 | help | 458 | help |
445 | Say M here if you have a sound card based on the Analog Devices | 459 | Say M here if you have a sound card based on the Analog Devices |
446 | AD1816(A) chip. | 460 | AD1816(A) chip. |
@@ -450,21 +464,21 @@ config SOUND_AD1816 | |||
450 | 464 | ||
451 | config SOUND_AD1889 | 465 | config SOUND_AD1889 |
452 | tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)" | 466 | tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)" |
453 | depends on EXPERIMENTAL && SOUND_OSS && PCI | 467 | depends on EXPERIMENTAL && SOUND_OSS && PCI && OSS_OBSOLETE_DRIVER |
454 | help | 468 | help |
455 | Say M here if you have a sound card based on the Analog Devices | 469 | Say M here if you have a sound card based on the Analog Devices |
456 | AD1889 chip. | 470 | AD1889 chip. |
457 | 471 | ||
458 | config SOUND_ADLIB | 472 | config SOUND_ADLIB |
459 | tristate "Adlib Cards" | 473 | tristate "Adlib Cards" |
460 | depends on SOUND_OSS | 474 | depends on SOUND_OSS && OSS_OBSOLETE_DRIVER |
461 | help | 475 | help |
462 | Includes ASB 64 4D. Information on programming AdLib cards is | 476 | Includes ASB 64 4D. Information on programming AdLib cards is |
463 | available at <http://www.itsnet.com/home/ldragon/Specs/adlib.html>. | 477 | available at <http://www.itsnet.com/home/ldragon/Specs/adlib.html>. |
464 | 478 | ||
465 | config SOUND_ACI_MIXER | 479 | config SOUND_ACI_MIXER |
466 | tristate "ACI mixer (miroSOUND PCM1-pro/PCM12/PCM20)" | 480 | tristate "ACI mixer (miroSOUND PCM1-pro/PCM12/PCM20)" |
467 | depends on SOUND_OSS | 481 | depends on SOUND_OSS && OSS_OBSOLETE_DRIVER |
468 | ---help--- | 482 | ---help--- |
469 | ACI (Audio Command Interface) is a protocol used to communicate with | 483 | ACI (Audio Command Interface) is a protocol used to communicate with |
470 | the microcontroller on some sound cards produced by miro and | 484 | the microcontroller on some sound cards produced by miro and |
@@ -586,7 +600,7 @@ config SOUND_MPU401 | |||
586 | 600 | ||
587 | config SOUND_NM256 | 601 | config SOUND_NM256 |
588 | tristate "NM256AV/NM256ZX audio support" | 602 | tristate "NM256AV/NM256ZX audio support" |
589 | depends on SOUND_OSS | 603 | depends on SOUND_OSS && OSS_OBSOLETE_DRIVER |
590 | help | 604 | help |
591 | Say M here to include audio support for the NeoMagic 256AV/256ZX | 605 | Say M here to include audio support for the NeoMagic 256AV/256ZX |
592 | chipsets. These are the audio chipsets found in the Sony | 606 | chipsets. These are the audio chipsets found in the Sony |
@@ -706,7 +720,7 @@ config SOUND_YM3812 | |||
706 | 720 | ||
707 | config SOUND_OPL3SA2 | 721 | config SOUND_OPL3SA2 |
708 | tristate "Yamaha OPL3-SA2 and SA3 based PnP cards" | 722 | tristate "Yamaha OPL3-SA2 and SA3 based PnP cards" |
709 | depends on SOUND_OSS | 723 | depends on SOUND_OSS && OSS_OBSOLETE_DRIVER |
710 | help | 724 | help |
711 | Say Y or M if you have a card based on one of these Yamaha sound | 725 | Say Y or M if you have a card based on one of these Yamaha sound |
712 | chipsets or the "SAx", which is actually a SA3. Read | 726 | chipsets or the "SAx", which is actually a SA3. Read |