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-s5p64x0
/
mach-smdk6450.c
diff --git
a/arch/arm/mach-s5p64x0/mach-smdk6450.c
b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index c3cacc067efed25aff9740a2d65b795c4dd59266..fa1341c074ca3a922615dfacf06891cf5bc62d5b 100644
(file)
--- a/
arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/
arch/arm/mach-s5p64x0/mach-smdk6450.c
@@
-17,6
+17,7
@@
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/serial_core.h>
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/module.h>
@@
-39,7
+40,6
@@
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
-#include <plat/regs-serial.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>
#include <plat/devs.h>