Merge branch 'master' of /home/src/linux-2.6/

[linux-2.6] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 71762d7e99701463cbf144599a7a7f5f8b51c5bb..f812ed129e589cc1929bdf06830eef5f60243006 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/major.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
@@ -404,7 +403,7 @@ int hci_get_conn_list(void __user *arg)
 
        size = sizeof(req) + req.conn_num * sizeof(*ci);
 
-       if (!(cl = (void *) kmalloc(size, GFP_KERNEL)))
+       if (!(cl = kmalloc(size, GFP_KERNEL)))
                return -ENOMEM;
 
        if (!(hdev = hci_dev_get(req.dev_id))) {