diff options
author | Steve French <sfrench@us.ibm.com> | 2008-08-26 20:56:05 +0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-08-26 20:56:05 +0400 |
commit | 3dae49abef945c55c10fa7c479cfd8fd13af55db (patch) | |
tree | 487c47c6d23cc28a259b913396aeaff0b792d32d /drivers/net/tokenring/lanstreamer.c | |
parent | 6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff) | |
parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
download | linux-3dae49abef945c55c10fa7c479cfd8fd13af55db.tar.xz |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 47d84cd28097..59d1673f9387 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c @@ -119,7 +119,6 @@ #include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/spinlock.h> -#include <linux/version.h> #include <linux/bitops.h> #include <linux/jiffies.h> |