projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-s3c24xx
/
pm.c
diff --git
a/arch/arm/plat-s3c24xx/pm.c
b/arch/arm/plat-s3c24xx/pm.c
index fc4b731a949cdd05907a8556384d7390ca9327c1..d3934b1119a9e0c855f3e16153c6bad696f26144 100644
(file)
--- a/
arch/arm/plat-s3c24xx/pm.c
+++ b/
arch/arm/plat-s3c24xx/pm.c
@@
-35,10
+35,10
@@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/serial_core.h>
+#include <linux/io.h>
#include <asm/cacheflush.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/plat-s3c/regs-serial.h>
#include <mach/regs-clock.h>