diff options
| author | David Woodhouse | 2008-07-15 00:49:04 +0200 |
|---|---|---|
| committer | David Woodhouse | 2008-07-15 00:51:11 +0200 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/firmware | |
| parent | ftrace: document updates (diff) | |
| parent | firmware: convert sb16_csp driver to use firmware loader exclusively (diff) | |
| download | kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.xz kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/dell_rbu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index 6a8b1e037e07..7430e218cda6 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c @@ -220,7 +220,7 @@ out_noalloc: return retval; } -static int packetize_data(void *data, size_t length) +static int packetize_data(const u8 *data, size_t length) { int rc = 0; int done = 0; |