summaryrefslogtreecommitdiff
path: root/drivers/net/tokenring/lanstreamer.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-08-26 20:56:05 +0400
committerSteve French <sfrench@us.ibm.com>2008-08-26 20:56:05 +0400
commit3dae49abef945c55c10fa7c479cfd8fd13af55db (patch)
tree487c47c6d23cc28a259b913396aeaff0b792d32d /drivers/net/tokenring/lanstreamer.h
parent6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff)
parentb8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff)
downloadlinux-3dae49abef945c55c10fa7c479cfd8fd13af55db.tar.xz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.h')
-rw-r--r--drivers/net/tokenring/lanstreamer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h
index e7bb3494afc7..13ccee6449c1 100644
--- a/drivers/net/tokenring/lanstreamer.h
+++ b/drivers/net/tokenring/lanstreamer.h
@@ -60,8 +60,6 @@
*
*/
-#include <linux/version.h>
-
/* MAX_INTR - the maximum number of times we can loop
* inside the interrupt function before returning
* control to the OS (maximum value is 256)