From 287fef39a09ac9bc61a372cb400837a58a251055 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 23 May 2008 23:57:19 +0100
Subject: [PATCH] --- yaml --- r: 100941 b: refs/heads/master c:
 f61e761e2128c7ca0d044651b18928991ab03be2 h: refs/heads/master i:   100939:
 5bd2b9ee52deb399bc458e8f855a1210dd4aecb7 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/char/cyclades.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 17ebe69cc6c3..98d682ce71b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8187b4fb9c17ea8e2a71c0563434f3ee08aad0d7
+refs/heads/master: f61e761e2128c7ca0d044651b18928991ab03be2
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index ef73e72daedc..6bff9d87dc57 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -4668,7 +4668,7 @@ static inline int __devinit cyc_isfwstr(const char *str, unsigned int size)
 	return 0;
 }
 
-static inline void __devinit cyz_fpga_copy(void __iomem *fpga, u8 *data,
+static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data,
 		unsigned int size)
 {
 	for (; size > 0; size--) {
@@ -4701,10 +4701,10 @@ static int __devinit __cyz_load_fw(const struct firmware *fw,
 		const char *name, const u32 mailbox, void __iomem *base,
 		void __iomem *fpga)
 {
-	void *ptr = fw->data;
-	struct zfile_header *h = ptr;
-	struct zfile_config *c, *cs;
-	struct zfile_block *b, *bs;
+	const void *ptr = fw->data;
+	const struct zfile_header *h = ptr;
+	const struct zfile_config *c, *cs;
+	const struct zfile_block *b, *bs;
 	unsigned int a, tmp, len = fw->size;
 #define BAD_FW KERN_ERR "Bad firmware: "
 	if (len < sizeof(*h)) {