diff --git a/[refs] b/[refs]
index 2c18159839d8..4297f9f24769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eadcf0d704a46979c29984fa05f1fc413c775bcb
+refs/heads/master: 361d5ee3c04c43c8fa0e277545ac5258dc310a5e
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index aabad8ce7458..8db4e6b89482 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/drivers/net/3c59x.c
@@ -1010,7 +1010,7 @@ static int __devinit vortex_probe1(struct device *gendev,
 	static int printed_version;
 	int retval, print_info;
 	struct vortex_chip_info * const vci = &vortex_info_tbl[chip_idx];
-	char *print_name = "3c59x";
+	const char *print_name = "3c59x";
 	struct pci_dev *pdev = NULL;
 	struct eisa_device *edev = NULL;
 	DECLARE_MAC_BUF(mac);