linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* PATCH: fix section conflict and typo in ALSA isa
@ 2003-07-27 20:26 Alan Cox
  0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2003-07-27 20:26 UTC (permalink / raw)
  To: linux-kernel, torvalds

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/isa/sb/emu8000.c linux-2.6.0-test2-ac1/sound/isa/sb/emu8000.c
--- linux-2.6.0-test2/sound/isa/sb/emu8000.c	2003-07-10 21:07:39.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/isa/sb/emu8000.c	2003-07-15 18:01:30.000000000 +0100
@@ -659,7 +659,7 @@
 {
 	soundfont_chorus_fx_t rec;
 	if (mode < SNDRV_EMU8000_CHORUS_PREDEFINED || mode >= SNDRV_EMU8000_CHORUS_NUMBERS) {
-		snd_printk(KERN_WARNING "illegal chorus mode %d for uploading\n", mode);
+		snd_printk(KERN_WARNING "invalid chorus mode %d for uploading\n", mode);
 		return -EINVAL;
 	}
 	if (len < (long)sizeof(rec) || copy_from_user(&rec, buf, sizeof(rec)))
@@ -787,7 +787,7 @@
 	soundfont_reverb_fx_t rec;
 
 	if (mode < SNDRV_EMU8000_REVERB_PREDEFINED || mode >= SNDRV_EMU8000_REVERB_NUMBERS) {
-		snd_printk(KERN_WARNING "illegal reverb mode %d for uploading\n", mode);
+		snd_printk(KERN_WARNING "invalid reverb mode %d for uploading\n", mode);
 		return -EINVAL;
 	}
 	if (len < (long)sizeof(rec) || copy_from_user(&rec, buf, sizeof(rec)))
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/sound/isa/sscape.c linux-2.6.0-test2-ac1/sound/isa/sscape.c
--- linux-2.6.0-test2/sound/isa/sscape.c	2003-07-10 21:05:23.000000000 +0100
+++ linux-2.6.0-test2-ac1/sound/isa/sscape.c	2003-07-23 16:39:21.000000000 +0100
@@ -809,7 +809,7 @@
  */
 static unsigned __devinit get_irq_config(int irq)
 {
-	static const int valid_irq[] __devinitdata = { 9, 5, 7, 10 };
+	const int valid_irq[] __devinitdata = { 9, 5, 7, 10 };
 	unsigned cfg;
 
 	for (cfg = 0; cfg < ARRAY_SIZE(valid_irq); ++cfg) {

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-07-28  1:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-27 20:26 PATCH: fix section conflict and typo in ALSA isa Alan Cox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).