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/acenic.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index e4483de84e7f..66de80b64b92 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | 52 | ||
| 53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 54 | #include <linux/moduleparam.h> | 54 | #include <linux/moduleparam.h> |
| 55 | #include <linux/version.h> | ||
| 56 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 57 | #include <linux/errno.h> | 56 | #include <linux/errno.h> |
| 58 | #include <linux/ioport.h> | 57 | #include <linux/ioport.h> |