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 bf5581a9aeea3121dd4a3cce6c8c78de5718e087..d3934b1119a9e0c855f3e16153c6bad696f26144 100644
(file)
--- a/
arch/arm/plat-s3c24xx/pm.c
+++ b/
arch/arm/plat-s3c24xx/pm.c
@@
-35,16
+35,16
@@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/serial_core.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/serial_core.h>
+#include <linux/io.h>
#include <asm/cacheflush.h>
#include <asm/cacheflush.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h>
#include <asm/plat-s3c/regs-serial.h>
-#include <
asm/ar
ch/regs-clock.h>
-#include <
asm/ar
ch/regs-gpio.h>
-#include <
asm/ar
ch/regs-mem.h>
-#include <
asm/ar
ch/regs-irq.h>
+#include <
ma
ch/regs-clock.h>
+#include <
ma
ch/regs-gpio.h>
+#include <
ma
ch/regs-mem.h>
+#include <
ma
ch/regs-irq.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>