diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 22:13:45 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 22:13:45 +0200 |
| commit | b1618547bb68bd32a8b5ed20f97fa577d16b6801 (patch) | |
| tree | 3a44c72206d5b9297e177c38f5c8d9ee68e901ed /arch/arm/mach-exynos/setup-i2c7.c | |
| parent | Merge branch 'next/cleanup' into late/kirkwood (diff) | |
| parent | Merge branch 'multiplatform/platform-data' into next/multiplatform (diff) | |
| download | linux-b1618547bb68bd32a8b5ed20f97fa577d16b6801.tar.xz linux-b1618547bb68bd32a8b5ed20f97fa577d16b6801.zip | |
Merge branch 'next/multiplatform' into late/kirkwood
By Arnd Bergmann (15) and David Brown (1)
* next/multiplatform:
ARM: msm: Move core.h contents into common.h
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Diffstat (limited to 'arch/arm/mach-exynos/setup-i2c7.c')
| -rw-r--r-- | arch/arm/mach-exynos/setup-i2c7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/setup-i2c7.c b/arch/arm/mach-exynos/setup-i2c7.c index b7611ee359a2..1bba75568a5f 100644 --- a/arch/arm/mach-exynos/setup-i2c7.c +++ b/arch/arm/mach-exynos/setup-i2c7.c @@ -13,7 +13,7 @@ struct platform_device; /* don't need the contents */ #include <linux/gpio.h> -#include <plat/iic.h> +#include <linux/platform_data/i2c-s3c2410.h> #include <plat/gpio-cfg.h> void s3c_i2c7_cfg_gpio(struct platform_device *dev) |