Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / drivers / net / bna / cna.h

diff --git a/drivers/net/bna/cna.h b/drivers/net/bna/cna.h
index bbd39dc..01b4af7 100644 (file)
--- a/drivers/net/bna/cna.h
+++ b/drivers/net/bna/cna.h
@@ -19,7 +19,6 @@
 #ifndef __CNA_H__
 #define __CNA_H__
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -74,7 +73,7 @@ typedef struct mac { u8 mac[MAC_ADDRLEN]; } mac_t;
                bfa_q_next(_q) = bfa_q_next(*((struct list_head **) _qe)); \
                bfa_q_qe_init(*((struct list_head **) _qe));            \
        } else {                                                        \
-               *((struct list_head **) (_qe)) = (struct list_head *) NULL; \
+               *((struct list_head **)(_qe)) = NULL;                   \
        }                                                               \
 }