diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 09:31:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 09:31:03 -0400 |
| commit | 77dd3b3bd23111040c504be6bd873a5ad09f02df (patch) | |
| tree | 119ddcdf89d6a593a8fefea530249084559eeb44 /include/linux/fs_uart_pd.h | |
| parent | 916c7a855174e3b53d182b97a26b2e27a29726a1 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into timers/ntp
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 { |