projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-imx
/
mach-vpr200.c
diff --git
a/arch/arm/mach-imx/mach-vpr200.c
b/arch/arm/mach-imx/mach-vpr200.c
index 0910761e8280894918927554598c1f4d1d1f4b79..8825d1217d189e7d026dff24f7b2e41af54fde4a 100644
(file)
--- a/
arch/arm/mach-imx/mach-vpr200.c
+++ b/
arch/arm/mach-imx/mach-vpr200.c
@@
-29,7
+29,7
@@
#include <asm/mach/time.h>
#include <linux/i2c.h>
-#include <linux/
i2c
/at24.h>
+#include <linux/
platform_data
/at24.h>
#include <linux/mfd/mc13xxx.h>
#include "common.h"