From 4b4e16150e3f1e13cbfcabb51db4cc75a37eefb1 Mon Sep 17 00:00:00 2001
From: Jirka Pirko <jirka@pirko.cz>
Date: Mon, 24 Nov 2008 14:48:25 -0800
Subject: [PATCH] --- yaml --- r: 122116 b: refs/heads/master c:
 138a5cdf2ffe8c6602641f8aaa00cfcf10929fe1 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/tokenring/3c359.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9a3c8fab4ca1..c4b20db148c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0cc10ab0e3740b629d88386c907342f77cbdb30
+refs/heads/master: 138a5cdf2ffe8c6602641f8aaa00cfcf10929fe1
diff --git a/trunk/drivers/net/tokenring/3c359.c b/trunk/drivers/net/tokenring/3c359.c
index 7b45a293f5ec..8a43ecd0d6e7 100644
--- a/trunk/drivers/net/tokenring/3c359.c
+++ b/trunk/drivers/net/tokenring/3c359.c
@@ -638,7 +638,7 @@ static int xl_open(struct net_device *dev)
 	/* These MUST be on 8 byte boundaries */
 	xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);
 	if (xl_priv->xl_tx_ring == NULL) {
-		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
+		printk(KERN_WARNING "%s: Not enough memory to allocate tx buffers.\n",
 				     dev->name);
 		free_irq(dev->irq,dev);
 		return -ENOMEM;