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 /include/linux/fs_uart_pd.h | |
| 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 'include/linux/fs_uart_pd.h')
| -rw-r--r-- | include/linux/fs_uart_pd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs_uart_pd.h b/include/linux/fs_uart_pd.h index 809bb9ffc788..36b61ff39277 100644 --- a/include/linux/fs_uart_pd.h +++ b/include/linux/fs_uart_pd.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef FS_UART_PD_H | 12 | #ifndef FS_UART_PD_H |
| 13 | #define FS_UART_PD_H | 13 | #define FS_UART_PD_H |
| 14 | 14 | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <asm/types.h> | 15 | #include <asm/types.h> |
| 17 | 16 | ||
| 18 | enum fs_uart_id { | 17 | enum fs_uart_id { |