From 495c7fe87f734c2bb3b43fe3ba42304146ed7f22 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 24 May 2008 00:13:08 +0100
Subject: [PATCH] --- yaml --- r: 100961 b: refs/heads/master c:
 3a9282cacdb13466b9c745518237938434dbde0b h: refs/heads/master i:   100959:
 53c1a0fe7e152391e13e4b22e896e1501c6a2ad3 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/dvb/dvb-usb/gp8psk.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 889e99c38ee8..b955b915c710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e62f89f2aebd57f48687f139c20cf6375693b622
+refs/heads/master: 3a9282cacdb13466b9c745518237938434dbde0b
diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk.c b/trunk/drivers/media/dvb/dvb-usb/gp8psk.c
index 2653120673b7..d965a923f391 100644
--- a/trunk/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/trunk/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -86,7 +86,8 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)
 {
 	int ret;
 	const struct firmware *fw = NULL;
-	u8 *ptr, *buf;
+	const u8 *ptr;
+	u8 *buf;
 	if ((ret = request_firmware(&fw, bcm4500_firmware,
 					&d->udev->dev)) != 0) {
 		err("did not find the bcm4500 firmware file. (%s) "