drm: merge Linux master into HEAD

[mv-sheeva.git] / drivers / serial / s3c2412.c

diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
index d0170319c729b6cf847ba2e33cd34754b44bc0e4..fd017b37556868ca2268d28101770e028d6538b0 100644 (file)
--- a/drivers/serial/s3c2412.c
+++ b/drivers/serial/s3c2412.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"