projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux.git]
/
arch
/
arm
/
mach-s3c24xx
/
dma-s3c2443.c
diff --git
a/arch/arm/mach-s3c24xx/dma-s3c2443.c
b/arch/arm/mach-s3c24xx/dma-s3c2443.c
index 95b9f759fe97fdea1df49efdf78f062f11a8d2aa..f4096ec0700ac7cf7396e2857eef9b26abb426b4 100644
(file)
--- a/
arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/
arch/arm/mach-s3c24xx/dma-s3c2443.c
@@
-16,6
+16,7
@@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/serial_core.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
#include <linux/io.h>
#include <mach/dma.h>
#include <linux/io.h>
#include <mach/dma.h>
@@
-23,7
+24,6
@@
#include <plat/dma-s3c24xx.h>
#include <plat/cpu.h>
#include <plat/dma-s3c24xx.h>
#include <plat/cpu.h>
-#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <plat/regs-dma.h>
#include <mach/regs-lcd.h>
#include <mach/regs-gpio.h>
#include <plat/regs-dma.h>
#include <mach/regs-lcd.h>