aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2012-04-18 19:54:26 -0700
committerTodd Poynor <toddpoynor@google.com>2012-04-18 19:54:26 -0700
commit635aaea87060186666212363e26acc5207873b32 (patch)
treeab9b09e5cc0e4fd98601e0d7f1fd3dd32c3c0103 /arch/arm/mach-omap2/include/mach
parentf32c4aa3516f811dbd47f1b5f2ca905e67d34f1d (diff)
parenta6d21d824242244ec6c02c18a517bf021f1e70cd (diff)
downloadkernel_samsung_tuna-635aaea87060186666212363e26acc5207873b32.zip
kernel_samsung_tuna-635aaea87060186666212363e26acc5207873b32.tar.gz
kernel_samsung_tuna-635aaea87060186666212363e26acc5207873b32.tar.bz2
Merge branch 'linux-omap-3.0' into android-omap-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 3a65b20..8a3ea34 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);