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) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:33 EST