summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/sram.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-11-09 14:54:17 -0800
committerTony Lindgren <tony@atomide.com>2012-11-09 14:54:17 -0800
commitf56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch)
treea9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /arch/arm/mach-omap1/sram.h
parent84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
downloadop-kernel-dev-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.zip
op-kernel-dev-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.tar.gz
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter.
Diffstat (limited to 'arch/arm/mach-omap1/sram.h')
-rw-r--r--arch/arm/mach-omap1/sram.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/sram.h b/arch/arm/mach-omap1/sram.h
new file mode 100644
index 0000000..d5a6c83
--- /dev/null
+++ b/arch/arm/mach-omap1/sram.h
@@ -0,0 +1,7 @@
+#include <plat/sram.h>
+
+extern void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl);
+
+/* Do not use these */
+extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl);
+extern unsigned long omap1_sram_reprogram_clock_sz;
OpenPOWER on IntegriCloud