aboutsummaryrefslogtreecommitdiff
path: root/drivers/atm/he.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
commit38afd6adf6bccd7176e88c07cac104d3639aa30d (patch)
tree2142409984b609e51ef60b6a14318dd4e878718a /drivers/atm/he.c
parent8ed1383fb7b6685968588141d5934e0e6715e954 (diff)
parent261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm/he.c')
-rw-r--r--drivers/atm/he.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index df2c83fd549..28250c9b32d 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -57,7 +57,6 @@
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/pci.h>