diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 +0000 |
commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/i2c.c | |
parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
download | op-kernel-dev-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.zip op-kernel-dev-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.gz |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/i2c.c')
-rw-r--r-- | arch/arm/mach-omap2/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c index ace9994..a12e224 100644 --- a/arch/arm/mach-omap2/i2c.c +++ b/arch/arm/mach-omap2/i2c.c @@ -21,7 +21,7 @@ #include <plat/cpu.h> #include <plat/i2c.h> -#include <plat/common.h> +#include "common.h" #include <plat/omap_hwmod.h> #include "mux.h" |