From 0f4f27ee5f3fde4af78c23fa9d14b6a189c9595d Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <elezegarcia@gmail.com>
Date: Wed, 18 Jul 2012 10:05:26 -0300
Subject: [PATCH] --- yaml --- r: 312081 b: refs/heads/master c:
 380e99fc44d79bc35af9ff1d3316ef4027ce775e h: refs/heads/master i:   312079:
 262a6a01c62ffd48930e2c0de0a00eee9c7916dd v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/cx25821/cx25821-core.c | 3 ---
 trunk/drivers/media/video/cx25821/cx25821.h      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index adb373efc848..8413748ccf74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a7298b7805ab55dea674a8aba97cf2eac20dca8
+refs/heads/master: 380e99fc44d79bc35af9ff1d3316ef4027ce775e
diff --git a/trunk/drivers/media/video/cx25821/cx25821-core.c b/trunk/drivers/media/video/cx25821/cx25821-core.c
index 83c1aa6b2e6c..f11f6f07e915 100644
--- a/trunk/drivers/media/video/cx25821/cx25821-core.c
+++ b/trunk/drivers/media/video/cx25821/cx25821-core.c
@@ -904,9 +904,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 	list_add_tail(&dev->devlist, &cx25821_devlist);
 	mutex_unlock(&cx25821_devlist_mutex);
 
-	strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown");
-	strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821");
-
 	if (dev->pci->device != 0x8210) {
 		pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n",
 			__func__, dev->pci->device);
diff --git a/trunk/drivers/media/video/cx25821/cx25821.h b/trunk/drivers/media/video/cx25821/cx25821.h
index b9aa801b00a7..029f2934a6d8 100644
--- a/trunk/drivers/media/video/cx25821/cx25821.h
+++ b/trunk/drivers/media/video/cx25821/cx25821.h
@@ -187,7 +187,7 @@ enum port {
 };
 
 struct cx25821_board {
-	char *name;
+	const char *name;
 	enum port porta;
 	enum port portb;
 	enum port portc;