diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-30 18:33:24 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 23:37:13 +0100 |
| commit | 01480bad0a91413e92077067e38e82ade78dc88a (patch) | |
| tree | 4d6e0f8dd1ace3541b2979ce37a40395c2128182 /arch | |
| parent | ARM: OMAP: Make plat-omap/i2c.c port checks local (diff) | |
| download | linux-01480bad0a91413e92077067e38e82ade78dc88a.tar.xz linux-01480bad0a91413e92077067e38e82ade78dc88a.zip | |
ARM: OMAP: Fix relative includes for shared i2c.h file
As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* shared code:
http://www.spinics.net/lists/linux-omap/msg80520.html
To fix this for the shared i2c.h, let's re-introduce
a minimal plat/i2c.h.
Note that drivers must not use this header as it will
break build for omap2+ CONFIG_MULTIPLATFORM builds.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/i2c.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/i2c.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/i2c.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/i2c.h (renamed from arch/arm/plat-omap/i2c.h) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h index 26e19d3b7924..3d40f6ea3485 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -30,7 +30,7 @@ #include <linux/mtd/mtd.h> #include <linux/i2c-omap.h> -#include "../plat-omap/i2c.h" +#include <plat/i2c.h> #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) void omap7xx_map_io(void); diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 54097a29f432..faca808cb3d9 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -23,7 +23,7 @@ #include <mach/mux.h> #include "soc.h" -#include "../plat-omap/i2c.h" +#include <plat/i2c.h> #define OMAP_I2C_SIZE 0x3f #define OMAP1_I2C_BASE 0xfffb3800 diff --git a/arch/arm/mach-omap2/i2c.h b/arch/arm/mach-omap2/i2c.h index 81dbb992a6bc..42b6f2e7d190 100644 --- a/arch/arm/mach-omap2/i2c.h +++ b/arch/arm/mach-omap2/i2c.h @@ -19,7 +19,7 @@ * */ -#include "../plat-omap/i2c.h" +#include <plat/i2c.h> #ifndef __MACH_OMAP2_I2C_H #define __MACH_OMAP2_I2C_H diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index d094273b9df5..4645dd40b886 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -31,9 +31,9 @@ #include <linux/err.h> #include <linux/clk.h> -#include <mach/irqs.h> +#include <plat/i2c.h> -#include "i2c.h" +#include <mach/irqs.h> #define OMAP_I2C_MAX_CONTROLLERS 4 static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS]; diff --git a/arch/arm/plat-omap/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h index 7a9028cb5a75..7a9028cb5a75 100644 --- a/arch/arm/plat-omap/i2c.h +++ b/arch/arm/plat-omap/include/plat/i2c.h |