Messages in this thread Patch in this message | | | Subject | Re: 2.6.0-test5-mm4: wanxl doesn't compile with gcc 2.95 | From | Krzysztof Halasa <> | Date | 23 Sep 2003 00:42:03 +0200 |
| |
Hi,
Adrian Bunk <bunk@fs.tum.de> writes:
> make[3]: *** [drivers/net/wan/wanxl.o] Error 1 > > <-- snip --> > > For gcc 2.95, all variable declarations must be at the beginning.
Sure, though it seems I keep overlooking things like this.
Does the following patch fix it? Thanks. -- Krzysztof Halasa, B*FH --- linux-2.6.orig/drivers/net/wan/wanxl.c 2003-09-23 00:18:19.000000000 +0200 +++ linux-2.6/drivers/net/wan/wanxl.c 2003-09-23 00:33:34.000000000 +0200 @@ -31,7 +31,7 @@ #include "wanxl.h" -static const char* version = "wanXL serial card driver version: 0.46"; +static const char* version = "wanXL serial card driver version: 0.47"; #define PLX_CTL_RESET 0x40000000 /* adapter reset */ @@ -125,7 +125,7 @@ dma_addr_t addr = pci_map_single(pdev, ptr, size, direction); if (addr + size > 0x100000000LL) printk(KERN_CRIT "wanXL %s: pci_map_single() returned memory" - " at 0x%X!\n", card_name(pdev), addr); + " at 0x%LX!\n", card_name(pdev), (u64)addr); return addr; } @@ -180,8 +180,7 @@ static inline void wanxl_tx_intr(port_t *port) { while (1) { - desc_t *desc; - desc = &get_status(port)->tx_descs[port->tx_in]; + desc_t *desc = &get_status(port)->tx_descs[port->tx_in]; struct sk_buff *skb = port->tx_skbs[port->tx_in]; switch (desc->stat) { @@ -292,10 +291,11 @@ { hdlc_device *hdlc = dev_to_hdlc(dev); port_t *port = hdlc_to_port(hdlc); + desc_t *desc; spin_lock(&port->lock); - desc_t *desc = &get_status(port)->tx_descs[port->tx_out]; + desc = &get_status(port)->tx_descs[port->tx_out]; if (desc->stat != PACKET_EMPTY) { /* should never happen - previous xmit should stop queue */ #ifdef DEBUG_PKT @@ -578,6 +578,14 @@ u8 *mem; /* memory virtual base addr */ int i, ports, alloc_size; +#ifndef MODULE + static int printed_version; + if (!printed_version) { + printed_version++; + printk(KERN_INFO "%s\n", version); + } +#endif + i = pci_enable_device(pdev); if (i) return i; @@ -628,7 +636,7 @@ #ifdef DEBUG_PCI printk(KERN_DEBUG "wanXL %s: pci_alloc_consistent() returned memory" - " at 0x%X\n", card_name(pdev), card->status_address); + " at 0x%LX\n", card_name(pdev), (u64)card->status_address); #endif /* FIXME when PCI/DMA subsystems are fixed. | |