From 0a1a9389b9215375f2aab9092d1c6452bb95ebfa Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 13 Sep 2010 18:23:53 +0000
Subject: [PATCH] --- yaml --- r: 214515 b: refs/heads/master c:
 6fa59c9da82adcc7d63a2776969548e2b45448e0 h: refs/heads/master i:   214513:
 3edca61304b4e3e2c676820bb3316548add1f5c3   214511:
 25bf6da45c4ed95d4e8ecb0c4fce9bbcd78191ad v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/3c515.c  | 4 +++-
 trunk/drivers/net/eth16i.c | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eb07643c4f1f..f2a2851e70e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f68ad7fbb421df0aa3c267768245b2e86a91f74
+refs/heads/master: 6fa59c9da82adcc7d63a2776969548e2b45448e0
diff --git a/trunk/drivers/net/3c515.c b/trunk/drivers/net/3c515.c
index 8a6eb0c44486..cdf7226a7c43 100644
--- a/trunk/drivers/net/3c515.c
+++ b/trunk/drivers/net/3c515.c
@@ -662,7 +662,9 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
 		pr_warning(" *** Warning: this IRQ is unlikely to work! ***\n");
 
 	{
-		char *ram_split[] = { "5:3", "3:1", "1:1", "3:5" };
+		static const char * const ram_split[] = {
+			"5:3", "3:1", "1:1", "3:5"
+		};
 		__u32 config;
 		EL3WINDOW(3);
 		vp->available_media = inw(ioaddr + Wn3_Options);
diff --git a/trunk/drivers/net/eth16i.c b/trunk/drivers/net/eth16i.c
index 10e39f2b31c3..ce22e15a3776 100644
--- a/trunk/drivers/net/eth16i.c
+++ b/trunk/drivers/net/eth16i.c
@@ -637,7 +637,9 @@ static void eth16i_initialize(struct net_device *dev, int boot)
 
 	/* Set interface port type */
 	if(boot) {
-		char *porttype[] = {"BNC", "DIX", "TP", "AUTO", "FROM_EPROM" };
+		static const char * const porttype[] = {
+			"BNC", "DIX", "TP", "AUTO", "FROM_EPROM"
+		};
 
 		switch(dev->if_port)
 		{