summaryrefslogtreecommitdiffstats
path: root/drivers/serial/s3c2410.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 17:39:56 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 17:39:56 +0200
commit1dd465cac8d3ba18a9840d032f6604147269c031 (patch)
tree78f00fdeae26d018def75e7517aa50e56f4994df /drivers/serial/s3c2410.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6 (diff)
parent[ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S (diff)
downloadlinux-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz
linux-1dd465cac8d3ba18a9840d032f6604147269c031.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial/s3c2410.c')
-rw-r--r--drivers/serial/s3c2410.c2
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 @@
#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-gpio.h>
-#include <asm/mach-types.h>
-
/* structures */
struct s3c24xx_uart_info {