Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6

[linux-2.6-omap-h63xx.git] / net / atm / lec.c

diff --git a/net/atm/lec.c b/net/atm/lec.c
index eea051338498922071b65a84304a994d110bda89..c4fc722fef9a2de2362b1b5ef52abba92d662996 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <linux/capability.h>
 
 /* We are ethernet device */
 #include <linux/if_ether.h>
@@ -1811,8 +1812,7 @@ make_entry(struct lec_priv *priv, unsigned char *mac_addr)
 {
         struct lec_arp_table *to_return;
 
-        to_return = (struct lec_arp_table *) kmalloc(sizeof(struct lec_arp_table),
-                                                    GFP_ATOMIC);
+        to_return = kmalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
         if (!to_return) {
                 printk("LEC: Arp entry kmalloc failed\n");
                 return NULL;