diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:13:45 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:13:45 -0700 |
commit | b1618547bb68bd32a8b5ed20f97fa577d16b6801 (patch) | |
tree | 3a44c72206d5b9297e177c38f5c8d9ee68e901ed /arch/arm/mach-s5pc100/setup-i2c1.c | |
parent | 0b177ab53d0a2303ba287ec8babfd6e1de801500 (diff) | |
parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
download | talos-obmc-linux-b1618547bb68bd32a8b5ed20f97fa577d16b6801.tar.gz talos-obmc-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-s5pc100/setup-i2c1.c')
-rw-r--r-- | arch/arm/mach-s5pc100/setup-i2c1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/setup-i2c1.c b/arch/arm/mach-s5pc100/setup-i2c1.c index aaff74a90dee..faa667ef02cb 100644 --- a/arch/arm/mach-s5pc100/setup-i2c1.c +++ b/arch/arm/mach-s5pc100/setup-i2c1.c @@ -18,7 +18,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_i2c1_cfg_gpio(struct platform_device *dev) |