diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /drivers/net/wireless/zd1201.c | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'drivers/net/wireless/zd1201.c')
| -rw-r--r-- | drivers/net/wireless/zd1201.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index d5c0c66188ca..78baa0f7926d 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
| @@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table); | |||
| 49 | static int zd1201_fw_upload(struct usb_device *dev, int apfw) | 49 | static int zd1201_fw_upload(struct usb_device *dev, int apfw) |
| 50 | { | 50 | { |
| 51 | const struct firmware *fw_entry; | 51 | const struct firmware *fw_entry; |
| 52 | char *data; | 52 | const char *data; |
| 53 | unsigned long len; | 53 | unsigned long len; |
| 54 | int err; | 54 | int err; |
| 55 | unsigned char ret; | 55 | unsigned char ret; |