diff options
| author | Colin Cross <ccross@android.com> | 2011-10-15 21:56:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-15 21:56:43 -0700 |
| commit | f8da5d4c5b033f10418d191e3f89e23116d48bcf (patch) | |
| tree | f67507d606f86559a8c066c882f7da434d6c7200 /arch/arm/mach-omap2/include/mach | |
| parent | 7aa0aa5448e8c1b52d4c84717ae0e62b19b8de00 (diff) | |
| parent | 79cfeae7d4060a36666aed89d7a838971258570c (diff) | |
| download | kernel_samsung_tuna-f8da5d4c5b033f10418d191e3f89e23116d48bcf.zip kernel_samsung_tuna-f8da5d4c5b033f10418d191e3f89e23116d48bcf.tar.gz kernel_samsung_tuna-f8da5d4c5b033f10418d191e3f89e23116d48bcf.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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/include/mach/emif.h b/arch/arm/mach-omap2/include/mach/emif.h index 6c2303b..70738ac 100644 --- a/arch/arm/mach-omap2/include/mach/emif.h +++ b/arch/arm/mach-omap2/include/mach/emif.h @@ -277,7 +277,7 @@ struct emif_regs { u32 temp_alert_config_derated; u32 emif_ddr_phy_ctlr_1_init; u32 emif_ddr_phy_ctlr_1_final; - s32 emif_ddr_selfrefresh_time; + s32 emif_ddr_selfrefresh_cycles; }; int omap_emif_setup_registers(u32 freq, |