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 ;