fix olympic driver build

PATCH New Jeff Garzik 1 participant 1 message May 29, 2003 Network drivers

lore

Share & tools

lore

Jeff Garzik

author

2003-05-29 04:46 UTC #0 lore raw

PATCH 1/1 fix olympic driver build

Simply un-splits a quoted string that is split across two lines, most likely by an editor's word wrapping.

Breaks kernel build w/ gcc 3.3.

Jeff

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1231 -> 1.1232
# drivers/net/tokenring/olympic.c 1.14 -> 1.15
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/29 [email protected] 1.1232
# [netdrvr olympic] fix build with gcc 3.3
# --------------------------------------------
#

drivers/net/tokenring/olympic.c +1 -2

diff -Nru a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
@@ -655,8 +655,7 @@
 	printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7])  );
 
 	printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
-	printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
-%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; 
+	printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; 
 #endif
 
 	writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);