git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_54xx_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 887a30fa775bd587f485d4f024ebaf85919eff7c..115473d441cde08bdbf360572b35ca41ae500ebd 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@
-20,7
+20,7
@@
#include <linux/io.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/power/smartreflex.h>
-#include <linux/i2c-omap.h>
+#include <linux/
platform_data/
i2c-omap.h>
#include <linux/omap-dma.h>