From 2e26012d2be78983658bab7f7ca4e762d58418e3 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 24 May 2008 00:08:55 +0100
Subject: [PATCH] --- yaml --- r: 100953 b: refs/heads/master c:
 8b72eb4333aba692a16339acf8a74d84b10d3568 h: refs/heads/master i:   100951:
 1e79e9dea7d200e0904b7d6f0dc56e2bb4dfceb5 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/p54/p54usb.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dce28f13b71f..c02817eaee72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f160ebcbeb6c9b79a770f22e14398158dac3de00
+refs/heads/master: 8b72eb4333aba692a16339acf8a74d84b10d3568
diff --git a/trunk/drivers/net/wireless/p54/p54usb.c b/trunk/drivers/net/wireless/p54/p54usb.c
index 1610a7308c1d..815c095ef797 100644
--- a/trunk/drivers/net/wireless/p54/p54usb.c
+++ b/trunk/drivers/net/wireless/p54/p54usb.c
@@ -376,7 +376,8 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
 	const struct firmware *fw_entry = NULL;
 	int err, alen;
 	u8 carry = 0;
-	u8 *buf, *tmp, *data;
+	u8 *buf, *tmp;
+	const u8 *data;
 	unsigned int left, remains, block_size;
 	struct x2_header *hdr;
 	unsigned long timeout;
@@ -523,7 +524,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)
 	void *buf;
 	__le32 reg;
 	unsigned int remains, offset;
-	u8 *data;
+	const u8 *data;
 
 	buf = kmalloc(512, GFP_KERNEL);
 	if (!buf) {