diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-25 22:45:37 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-25 22:45:37 -0700 |
| commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
| tree | 732f4e4794f3c116041242f69754637f75c0dd57 /drivers/net/typhoon.c | |
| parent | ed21763e7b0b3fb50e4efd9d4bc17ef5b035d304 (diff) | |
| parent | 08970fc4e0385790a7b093adfaa4165a189f9eb0 (diff) | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 8549f1159a3..734ce0977f0 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -128,7 +128,6 @@ static const int multicast_filter_limit = 32; #include <asm/io.h> #include <asm/uaccess.h> #include <linux/in6.h> -#include <linux/version.h> #include <linux/dma-mapping.h> #include "typhoon.h" |