diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /arch/mn10300 | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index 8b054e7a8ae8..aa07d0cd1905 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
| @@ -17,7 +17,6 @@ static const char serial_revdate[] = "2007-11-06"; | |||
| 17 | #define SUPPORT_SYSRQ | 17 | #define SUPPORT_SYSRQ |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/serial.h> | 21 | #include <linux/serial.h> |
| 23 | #include <linux/circ_buf.h> | 22 | #include <linux/circ_buf.h> |