From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id E16E6DDE21 for ; Fri, 5 Jan 2007 08:33:32 +1100 (EST) Subject: Re: [2.6 patch] schedule obsolete OSS drivers for removal, 3rd round From: Benjamin Herrenschmidt To: Adrian Bunk In-Reply-To: <20070104185353.GI20714@stusta.de> References: <20070104185353.GI20714@stusta.de> Content-Type: text/plain Date: Fri, 05 Jan 2007 08:31:15 +1100 Message-Id: <1167946275.5273.13.camel@localhost.localdomain> Mime-Version: 1.0 Cc: Andrew Morton , linuxppc-dev@ozlabs.org, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, sailer@ife.ee.ethz.ch List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 2007-01-04 at 19:53 +0100, Adrian Bunk wrote: > 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/12/18/305 > > Signed-off-by: Adrian Bunk > Acked-By: Thomas Sailer Ack for the dmasound_pmac bits Ben. > --- > > Documentation/feature-removal-schedule.txt | 7 +++++++ > sound/oss/Kconfig | 16 +++++++++++++++- > sound/oss/dmasound/Kconfig | 2 +- > 3 files changed, 23 insertions(+), 2 deletions(-) > > --- linux-2.6.20-rc2-mm1/Documentation/feature-removal-schedule.txt.old 2007-01-04 19:02:33.000000000 +0100 > +++ linux-2.6.20-rc2-mm1/Documentation/feature-removal-schedule.txt 2007-01-04 19:04:46.000000000 +0100 > @@ -221,3 +221,10 @@ > Who: Venkatesh Pallipadi > > --------------------------- > + > +What: drivers depending on OBSOLETE_OSS > +When: options in 2.6.22, code in 2.6.24 > +Why: OSS drivers with ALSA replacements > +Who: Adrian Bunk > + > +--------------------------- > --- linux-2.6.20-rc2-mm1/sound/oss/Kconfig.old 2007-01-04 19:04:58.000000000 +0100 > +++ linux-2.6.20-rc2-mm1/sound/oss/Kconfig 2007-01-04 19:07:30.000000000 +0100 > @@ -5,6 +5,20 @@ > # > # Prompt user for primary drivers. > > +config OBSOLETE_OSS > + 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 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 > @@ -33,7 +47,7 @@ > > config SOUND_ES1371 > tristate "Creative Ensoniq AudioPCI 97 (ES1371)" > - depends on SOUND_PRIME && PCI > + depends on SOUND_PRIME && PCI && OBSOLETE_OSS > help > Say Y or M if you have a PCI sound card utilizing the Ensoniq > ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if > --- linux-2.6.20-rc2-mm1/sound/oss/dmasound/Kconfig.old 2007-01-04 19:07:04.000000000 +0100 > +++ linux-2.6.20-rc2-mm1/sound/oss/dmasound/Kconfig 2007-01-04 19:07:28.000000000 +0100 > @@ -14,7 +14,7 @@ > > config DMASOUND_PMAC > tristate "PowerMac DMA sound support" > - depends on PPC32 && PPC_PMAC && SOUND && I2C > + depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS > select DMASOUND > help > If you want to use the internal audio of your PowerMac in Linux,