lkml.org 
[lkml]   [2003]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.5 patch] fix sound/oss/mad16.c compile
On Mon, Mar 24, 2003 at 03:26:47PM -0800, Linus Torvalds wrote:
>...
> Summary of changes from v2.5.65 to v2.5.66
> ============================================
>...
> Dave Jones <davej@codemonkey.org.uk>:
>...
> o guard mad16 debug macro
>...


This change broke the compilation of sound/oss/mad16.c:

<-- snip -->

...
gcc -Wp,-MD,sound/oss/.mad16.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe
-mpreferred-stack-boundary=2 -march=k6 -Iinclude/asm-i386/mach-default -nostdinc
-iwithprefix include -DKBUILD_BASENAME=mad16 -DKBUILD_MODNAME=mad16 -c -o
sound/oss/mad16.o sound/oss/mad16.c
...
sound/oss/mad16.c: In function `probe_mad16':
sound/oss/mad16.c:541: syntax error before "else"
sound/oss/mad16.c:604: syntax error before "else"
make[2]: *** [sound/oss/mad16.o] Error 1

<-- snip -->


The following patch is needed:


--- linux-2.5.66-notfull/sound/oss/mad16.c.old 2003-03-26 11:52:13.000000000 +0100
+++ linux-2.5.66-notfull/sound/oss/mad16.c 2003-03-26 11:55:06.000000000 +0100
@@ -537,7 +537,7 @@

for (i = 0xf8d; i <= 0xf93; i++) {
if (!c924pnp)
- DDB(printk("port %03x = %02x\n", i, mad_read(i)))
+ DDB(printk("port %03x = %02x\n", i, mad_read(i)));
else
DDB(printk("port %03x = %02x\n", i-0x80, mad_read(i)));
}
@@ -600,7 +600,7 @@

for (i = 0xf8d; i <= 0xf93; i++) {
if (!c924pnp)
- DDB(printk("port %03x after init = %02x\n", i, mad_read(i)))
+ DDB(printk("port %03x after init = %02x\n", i, mad_read(i)));
else
DDB(printk("port %03x after init = %02x\n", i-0x80, mad_read(i)));
}

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-
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/

\
 
 \ /
  Last update: 2005-03-22 13:34    [W:0.138 / U:2.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site