diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 01:45:37 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 01:45:37 -0400 |
| commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
| tree | 732f4e4794f3c116041242f69754637f75c0dd57 /drivers/net/tokenring/lanstreamer.h | |
| parent | ed21763e7b0b3fb50e4efd9d4bc17ef5b035d304 (diff) | |
| parent | 08970fc4e0385790a7b093adfaa4165a189f9eb0 (diff) | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.h')
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.h | 2 |
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 @@ | |||
| 60 | * | 60 | * |
| 61 | */ | 61 | */ |
| 62 | 62 | ||
| 63 | #include <linux/version.h> | ||
| 64 | |||
| 65 | /* MAX_INTR - the maximum number of times we can loop | 63 | /* MAX_INTR - the maximum number of times we can loop |
| 66 | * inside the interrupt function before returning | 64 | * inside the interrupt function before returning |
| 67 | * control to the OS (maximum value is 256) | 65 | * control to the OS (maximum value is 256) |