diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
| commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
| tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /arch/arm/mach-imx/mach-pca100.c | |
| parent | deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set (diff) | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-37e2c2a775fc887acd1432908478dfd532f7f00f.tar.xz linux-37e2c2a775fc887acd1432908478dfd532f7f00f.zip | |
Merge commit v3.13-rc1 into kbuild/misc
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 19bb6441a7d4..c5f95674e9b7 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c @@ -20,7 +20,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/i2c.h> -#include <linux/i2c/at24.h> +#include <linux/platform_data/at24.h> #include <linux/dma-mapping.h> #include <linux/spi/spi.h> #include <linux/spi/eeprom.h> |