[2.4 patch][3/6] ircomm_param.c: fix __FUNCTION__ paste error

From: Adrian Bunk
Date: Thu Aug 26 2004 - 21:29:00 EST


I got the following compile error when trying to build 2.4.28-pre2 using
gcc 3.4:

<-- snip -->

...
gcc-3.4 -D__KERNEL__
-I/home/bunk/linux/kernel-2.4/linux-2.4.28-pre2-full/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=athlon
-fno-unit-at-a-time -nostdinc -iwithprefix include
-DKBUILD_BASENAME=ircomm_param -c -o ircomm_param.o ircomm_param.c
ircomm_param.c: In function `ircomm_param_service_type':
ircomm_param.c:201: error: parse error before "__FUNCTION__"
make[4]: *** [ircomm_param.o] Error 1
make[4]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.28-pre2-full/net/irda/ircomm'

<-- snip -->


The patch below fixes this issue by removing the superfluous
__FUNCTION__ (similar to how it is in 2.6).


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.4.28-pre2-full/net/irda/ircomm/ircomm_param.c.old 2004-08-26 19:28:00.000000000 +0200
+++ linux-2.4.28-pre2-full/net/irda/ircomm/ircomm_param.c 2004-08-26 19:29:46.000000000 +0200
@@ -198,7 +198,7 @@
IRDA_DEBUG(2, "%s(), No common service type to use!\n", __FUNCTION__);
return -1;
}
- IRDA_DEBUG(0, __FUNCTION__ "%s(), services in common=%02x\n", __FUNCTION__,
+ IRDA_DEBUG(0, "%s(), services in common=%02x\n", __FUNCTION__ ,
service_type);

/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/