diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /arch/arm/mach-omap2/clock3517.c | |
parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
download | talos-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.gz talos-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/clock3517.c')
-rw-r--r-- | arch/arm/mach-omap2/clock3517.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock3517.c b/arch/arm/mach-omap2/clock3517.c index 2e97d08f0e56..80209050cd7a 100644 --- a/arch/arm/mach-omap2/clock3517.c +++ b/arch/arm/mach-omap2/clock3517.c @@ -21,8 +21,6 @@ #include <linux/clk.h> #include <linux/io.h> -#include <plat/clock.h> - #include "clock.h" #include "clock3517.h" #include "cm2xxx_3xxx.h" |