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 branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
isdn
/
i4l
/
isdn_bsdcomp.c
diff --git
a/drivers/isdn/i4l/isdn_bsdcomp.c
b/drivers/isdn/i4l/isdn_bsdcomp.c
index
0afe442
..
90a2379
100644
(file)
--- a/
drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/
drivers/isdn/i4l/isdn_bsdcomp.c
@@
-56,7
+56,6
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
@@
-331,12
+330,10
@@
static void *bsd_alloc (struct isdn_ppp_comp_data *data)
* Allocate the main control structure for this instance.
*/
maxmaxcode = MAXCODE(bits);
* Allocate the main control structure for this instance.
*/
maxmaxcode = MAXCODE(bits);
- db =
(struct bsd_db *) km
alloc (sizeof (struct bsd_db),GFP_KERNEL);
+ db =
kz
alloc (sizeof (struct bsd_db),GFP_KERNEL);
if (!db)
return NULL;
if (!db)
return NULL;
- memset (db, 0, sizeof(struct bsd_db));
-
db->xmit = data->flags & IPPP_COMP_FLAG_XMIT;
decomp = db->xmit ? 0 : 1;
db->xmit = data->flags & IPPP_COMP_FLAG_XMIT;
decomp = db->xmit ? 0 : 1;