diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
| commit | fe47784ba5cbb6b713c013e046859946789b45e4 (patch) | |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 /drivers/net/cpmac.c | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'drivers/net/cpmac.c')
| -rw-r--r-- | drivers/net/cpmac.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index a7800e559090..ec6b0af3d46b 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/version.h> | ||
| 30 | 29 | ||
| 31 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 32 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |