Messages in this thread Patch in this message | | | Date | Sun, 1 Aug 2004 02:32:43 +0200 (CEST) | From | Jesper Juhl <> | Subject | [PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2' |
| |
To silence the warning in $subject, rename log2 to cycx_log2 in this file to remove the clash, so there's no doubt that this file uses it's own defined log2 function.
Patch against 2.6.8-rc2-mm1
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
diff -up linux-2.6.8-rc2-mm1-orig/drivers/net/wan/cycx_x25.c linux-2.6.8-rc2-mm1/drivers/net/wan/cycx_x25.c --- linux-2.6.8-rc2-mm1-orig/drivers/net/wan/cycx_x25.c 2004-06-16 07:19:01.000000000 +0200 +++ linux-2.6.8-rc2-mm1/drivers/net/wan/cycx_x25.c 2004-07-31 22:10:02.000000000 +0200 @@ -186,7 +186,7 @@ static void nibble_to_byte(u8 *s, u8 *d, reset_timer(struct net_device *dev);
static u8 bps_to_speed_code(u32 bps); -static u8 log2(u32 n); +static u8 cycx_log2(u32 n);
static unsigned dec_to_uint(u8 *str, int len);
@@ -263,7 +263,7 @@ int cycx_x25_wan_init(struct cycx_device else card->wandev.mtu = 64;
- cfg.pktlen = log2(card->wandev.mtu); + cfg.pktlen = cycx_log2(card->wandev.mtu);
if (conf->station == WANOPT_DTE) { cfg.locaddr = 3; /* DTE */ @@ -1513,7 +1513,7 @@ static u8 bps_to_speed_code(u32 bps) }
/* log base 2 */ -static u8 log2(u32 n) +static u8 cycx_log2(u32 n) { u8 log = 0;
- 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/
| |