summaryrefslogtreecommitdiffstats
path: root/drivers/serial/s3c2412.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /drivers/serial/s3c2412.c
parentx86: fix setup code crashes on my old 486 box (diff)
parentLinux 2.6.27-rc3 (diff)
downloadlinux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz
linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'drivers/serial/s3c2412.c')
-rw-r--r--drivers/serial/s3c2412.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
index ce0c220e3e92..d0170319c729 100644
--- a/drivers/serial/s3c2412.c
+++ b/drivers/serial/s3c2412.c
@@ -19,10 +19,10 @@
#include <linux/serial.h>
#include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
#include "samsung.h"