git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
[pandora-kernel.git]
/
drivers
/
net
/
bsd_comp.c
diff --git
a/drivers/net/bsd_comp.c
b/drivers/net/bsd_comp.c
index
bae1de1
..
7845eaf
100644
(file)
--- a/
drivers/net/bsd_comp.c
+++ b/
drivers/net/bsd_comp.c
@@
-395,7
+395,7
@@
static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
* Allocate the main control structure for this instance.
*/
maxmaxcode = MAXCODE(bits);
- db =
(struct bsd_db *) kmalloc
(sizeof (struct bsd_db),
+ db =
kmalloc
(sizeof (struct bsd_db),
GFP_KERNEL);
if (!db)
{