From a04a2277d6fbfb49974eeb044a8cdda8ec5ccbe1 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: 97343 b: refs/heads/master c:
 5d9bac8ece5e2a64a2a450c7e2d6901ed9152052 h: refs/heads/master i:   97341:
 6c533495f6e8a27d56b10942c128b8535fe00472   97339:
 21f8326566e7a1b3942c19e6c95799742f2f09da   97335:
 74e65b7a02f33e1950ac6ed328b2bb7c66268579   97327:
 4274890e64c6f8e852aeee43922189ac5d6bbd0e   97311:
 748830a473744099ff16a2d2d97cb270b2e626c6   97279:
 0775dc6c320ece2b445d82d3e8b4f68ed29f8e5f v: v3

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

diff --git a/[refs] b/[refs]
index 697c1714e744..2db16c754954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b166cfba01d62d04ae81ecce2d5dbe308db8083a
+refs/heads/master: 5d9bac8ece5e2a64a2a450c7e2d6901ed9152052
diff --git a/trunk/drivers/net/tokenring/3c359.h b/trunk/drivers/net/tokenring/3c359.h
index b880cba0f6fd..74cf8e1a181b 100644
--- a/trunk/drivers/net/tokenring/3c359.h
+++ b/trunk/drivers/net/tokenring/3c359.h
@@ -264,7 +264,7 @@ struct xl_private {
 	u16 asb;
 
 	u8 __iomem *xl_mmio;
-	char *xl_card_name;
+	const char *xl_card_name;
 	struct pci_dev *pdev ; 
 	
 	spinlock_t xl_lock ;