From c3a43e3b71b6083ad694f14f6b03e1719e31ea84 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 23 May 2008 18:38:49 +0100
Subject: [PATCH] --- yaml --- r: 100973 b: refs/heads/master c:
 b7a39bd0afc4021e8ad2b1189e884551e147427f h: refs/heads/master i:   100971:
 a1703199a884a5eeb0a0f8396c132a23f62f88bf v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/base/firmware_class.c | 2 +-
 trunk/include/linux/firmware.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 461becaf019d..0f1fce934df3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd4f80de4612cc5255c108a8c13df88f89c46654
+refs/heads/master: b7a39bd0afc4021e8ad2b1189e884551e147427f
diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c
index 9fd4a8534146..264b3a2cd860 100644
--- a/trunk/drivers/base/firmware_class.c
+++ b/trunk/drivers/base/firmware_class.c
@@ -257,7 +257,7 @@ firmware_data_write(struct kobject *kobj, struct bin_attribute *bin_attr,
 	if (retval)
 		goto out;
 
-	memcpy(fw->data + offset, buffer, count);
+	memcpy((u8 *)fw->data + offset, buffer, count);
 
 	fw->size = max_t(size_t, offset + count, fw->size);
 	retval = count;
diff --git a/trunk/include/linux/firmware.h b/trunk/include/linux/firmware.h
index 6c7eff2ebada..88718d60153c 100644
--- a/trunk/include/linux/firmware.h
+++ b/trunk/include/linux/firmware.h
@@ -8,7 +8,7 @@
 
 struct firmware {
 	size_t size;
-	u8 *data;
+	const u8 *data;
 };
 
 struct device;