diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-30 13:33:24 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 18:37:13 -0400 |
commit | 01480bad0a91413e92077067e38e82ade78dc88a (patch) | |
tree | 4d6e0f8dd1ace3541b2979ce37a40395c2128182 /arch/arm/mach-omap1 | |
parent | c34f7c696211e3d45ff94a34824b65aa52576bc6 (diff) |
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/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/i2c.c | 2 |
2 files changed, 2 insertions, 2 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 @@ | |||
30 | #include <linux/mtd/mtd.h> | 30 | #include <linux/mtd/mtd.h> |
31 | #include <linux/i2c-omap.h> | 31 | #include <linux/i2c-omap.h> |
32 | 32 | ||
33 | #include "../plat-omap/i2c.h" | 33 | #include <plat/i2c.h> |
34 | 34 | ||
35 | #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) | 35 | #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
36 | void omap7xx_map_io(void); | 36 | 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 @@ | |||
23 | #include <mach/mux.h> | 23 | #include <mach/mux.h> |
24 | #include "soc.h" | 24 | #include "soc.h" |
25 | 25 | ||
26 | #include "../plat-omap/i2c.h" | 26 | #include <plat/i2c.h> |
27 | 27 | ||
28 | #define OMAP_I2C_SIZE 0x3f | 28 | #define OMAP_I2C_SIZE 0x3f |
29 | #define OMAP1_I2C_BASE 0xfffb3800 | 29 | #define OMAP1_I2C_BASE 0xfffb3800 |