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 tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-sa1100
/
h3xxx.c
diff --git
a/arch/arm/mach-sa1100/h3xxx.c
b/arch/arm/mach-sa1100/h3xxx.c
index 63150e1ffe9ecee4f45355ba41d92d3f02119216..f17e7382242a1a8fc851996ca1b59f296299a1f1 100644
(file)
--- a/
arch/arm/mach-sa1100/h3xxx.c
+++ b/
arch/arm/mach-sa1100/h3xxx.c
@@
-17,12
+17,12
@@
#include <linux/mfd/htc-egpio.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mfd/htc-egpio.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/platform_data/sa11x0-serial.h>
#include <linux/platform_device.h>
#include <linux/serial_core.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <linux/platform_device.h>
#include <linux/serial_core.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
-#include <asm/mach/serial_sa1100.h>
#include <mach/h3xxx.h>
#include <mach/h3xxx.h>