Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_bsdcomp.c

diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index a20f33b4a220f4399dd635dd3af6344f62bb8304..02d9918705dd5d70a96f538e6244e641f4dc9bca 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/sched.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>
@@ -342,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
         * Allocate space for the dictionary. This may be more than one page in
         * length.
         */
-       db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));
+       db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
        if (!db->dict) {
                bsd_free (db);
                return NULL;
@@ -355,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
        if (!decomp)
                db->lens = NULL;
        else {
-               db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
-                       sizeof (db->lens[0]));
+               db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
                if (!db->lens) {
                        bsd_free (db);
                        return (NULL);