aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2012-04-18 19:55:15 -0700
committerTodd Poynor <toddpoynor@google.com>2012-04-18 19:55:15 -0700
commit0fd69b72de1a40a4c4234ce3e96270253931f348 (patch)
treece5deca52631216aec729c72fb814faba75f94c2 /arch/arm/mach-omap2/include/mach
parent0faf39378fcd3951890e2119f85438668ff8a7c6 (diff)
parent635aaea87060186666212363e26acc5207873b32 (diff)
downloadkernel_samsung_tuna-0fd69b72de1a40a4c4234ce3e96270253931f348.zip
kernel_samsung_tuna-0fd69b72de1a40a4c4234ce3e96270253931f348.tar.gz
kernel_samsung_tuna-0fd69b72de1a40a4c4234ce3e96270253931f348.tar.bz2
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'arch/arm/mach-omap2/include/mach')
-rw-r--r--arch/arm/mach-omap2/include/mach/emif.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/include/mach/emif.h b/arch/arm/mach-omap2/include/mach/emif.h
index 99a7c69..d7e1eb9 100644
--- a/arch/arm/mach-omap2/include/mach/emif.h
+++ b/arch/arm/mach-omap2/include/mach/emif.h
@@ -258,6 +258,8 @@ struct emif_regs {
int omap_emif_setup_registers(u32 freq,
u32 volt_state);
+void omap_emif_frequency_pre_notify(void);
+void omap_emif_frequency_post_notify(void);
int omap_emif_setup_device_details(
const struct emif_device_details *emif1_devices,
const struct emif_device_details *emif2_devices);