From 4621608e96541b6a7775a168bf88bb7edca552f7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 14 May 2008 16:20:15 -0700
Subject: [PATCH] --- yaml --- r: 97344 b: refs/heads/master c:
 63dac8ff1b3709b5f7ba71283eb48b4e1f18d563 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2db16c754954..871e87525ca7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d9bac8ece5e2a64a2a450c7e2d6901ed9152052
+refs/heads/master: 63dac8ff1b3709b5f7ba71283eb48b4e1f18d563
diff --git a/trunk/drivers/net/tokenring/olympic.h b/trunk/drivers/net/tokenring/olympic.h
index c91956310fb2..10fbba08978f 100644
--- a/trunk/drivers/net/tokenring/olympic.h
+++ b/trunk/drivers/net/tokenring/olympic.h
@@ -254,7 +254,7 @@ struct olympic_private {
 	u8 __iomem *olympic_mmio;
 	u8 __iomem *olympic_lap;
 	struct pci_dev *pdev ; 
-	char *olympic_card_name ; 
+	const char *olympic_card_name;
 
 	spinlock_t olympic_lock ;