diff options
| author | Simon Horman <horms@verge.net.au> | 2008-09-09 19:14:52 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-09 19:14:52 -0400 |
| commit | c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24 (patch) | |
| tree | 1202d018129ca5538cd98b1e4542b239045c1a2d /include/linux/fs_uart_pd.h | |
| parent | e9c0ce232e7a36daae1ca08282609d7f0c57c567 (diff) | |
| parent | 28faa979746b2352cd78a376bf9f52db953bda46 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
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 { |