diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /arch/arm/mach-omap2/board-h4.c | |
| parent | ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init (diff) | |
| parent | ARM: OMAP2+: Fix eMMC on n900 with device tree (diff) | |
| download | linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.xz linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 87e41a8b8d46..f7808349a734 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -20,7 +20,7 @@ #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h> -#include <linux/i2c/at24.h> +#include <linux/platform_data/at24.h> #include <linux/input.h> #include <linux/err.h> #include <linux/clk.h> |