diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/net/typhoon.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
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 8549f1159a30..734ce0977f02 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -128,7 +128,6 @@ static const int multicast_filter_limit = 32; | |||
| 128 | #include <asm/io.h> | 128 | #include <asm/io.h> |
| 129 | #include <asm/uaccess.h> | 129 | #include <asm/uaccess.h> |
| 130 | #include <linux/in6.h> | 130 | #include <linux/in6.h> |
| 131 | #include <linux/version.h> | ||
| 132 | #include <linux/dma-mapping.h> | 131 | #include <linux/dma-mapping.h> |
| 133 | 132 | ||
| 134 | #include "typhoon.h" | 133 | #include "typhoon.h" |