Re: 2.6.25-mm1 (snd-pcsp causes driver conflict)

[Stas Sergeev <stsp@aknet.ru>]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hello.

Takashi Iwai wrote:
> Err, no, this wasn't merged to sound git tree because apparently the
> patch is to 2.6.22 and you didn't resubmit it...
That's simply because the old one
applies fine. :)

> No, I gave no ACK yet.
OK, sorry.

> I'd rather add a new line with a single "depends on SND_PCSP=n".
> You see a clear difference in the art of dependencies, one for
> architectures and one for driver-specific.
Done.

---
- Update CREDITS with the pc-speaker
driver authors.
- Prevent pcspkr from being built together
with snd-pcsp.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: pcsp-kernel-2.6.25-01.diff --]
[-- Type: text/x-patch; name="pcsp-kernel-2.6.25-01.diff", Size: 1174 bytes --]

diff -ur linux-2.6.25/CREDITS linux-2.6.25-pcsp-kern/CREDITS
--- linux-2.6.25/CREDITS	2008-02-16 22:37:23.000000000 +0300
+++ linux-2.6.25-pcsp-kern/CREDITS	2008-04-22 21:45:23.000000000 +0400
@@ -403,6 +403,8 @@
 N: Erik Inge Bolsø
 E: knan@mo.himolde.no
 D: Misc kernel hacks
+D: Updated PC speaker driver for 2.3
+S: Norway
 
 N: Andreas E. Bombe
 E: andreas.bombe@munich.netsurf.de
@@ -3116,6 +3118,12 @@
 S: Sunnyvale, California 94088-4132
 S: USA
 
+N: Stas Sergeev
+E: stsp@users.sourceforge.net
+D: PCM PC-Speaker driver
+D: misc fixes
+S: Russia
+
 N: Simon Shapiro
 E: shimon@i-Connect.Net
 W: http://www.-i-Connect.Net/~shimon
diff -ur linux-2.6.25/drivers/input/misc/Kconfig linux-2.6.25-pcsp-kern/drivers/input/misc/Kconfig
--- linux-2.6.25/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
+++ linux-2.6.25-pcsp-kern/drivers/input/misc/Kconfig	2008-04-22 21:45:23.000000000 +0400
@@ -15,6 +15,7 @@
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
 	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	depends on SND_PCSP=n
 	help
 	  Say Y here if you want the standard PC Speaker to be used for
 	  bells and whistles.