diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 07:02:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 07:02:35 -0400 |
| commit | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c (patch) | |
| tree | e9684c84f53272319a5acd4b9c86503f30274a51 /drivers/net/tokenring/lanstreamer.c | |
| parent | 11c231a962c740b3216eb6565149ae5a7944cba7 (diff) | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 @@ | |||
| 119 | #include <linux/pci.h> | 119 | #include <linux/pci.h> |
| 120 | #include <linux/dma-mapping.h> | 120 | #include <linux/dma-mapping.h> |
| 121 | #include <linux/spinlock.h> | 121 | #include <linux/spinlock.h> |
| 122 | #include <linux/version.h> | ||
| 123 | #include <linux/bitops.h> | 122 | #include <linux/bitops.h> |
| 124 | #include <linux/jiffies.h> | 123 | #include <linux/jiffies.h> |
| 125 | 124 | ||