Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 29a48e8b59d3..cf22de71014e 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 
 #include "vnic_resource.h"
 #include "vnic_devcmd.h"
@@ -36,7 +37,6 @@ struct vnic_res {
 };
 
 #define VNIC_DEV_CAP_INIT       0x0001
-#define VNIC_DEV_CAP_PERBI      0x0002
 
 struct vnic_dev {
         void *priv;