diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /drivers/serial | |
| parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
| parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/s3c2410.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 1195e6a0901a..50d7870d92bb 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -82,8 +82,6 @@ | |||
| 82 | #include <asm/arch/regs-serial.h> | 82 | #include <asm/arch/regs-serial.h> |
| 83 | #include <asm/arch/regs-gpio.h> | 83 | #include <asm/arch/regs-gpio.h> |
| 84 | 84 | ||
| 85 | #include <asm/mach-types.h> | ||
| 86 | |||
| 87 | /* structures */ | 85 | /* structures */ |
| 88 | 86 | ||
| 89 | struct s3c24xx_uart_info { | 87 | struct s3c24xx_uart_info { |