diff options
author | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
---|---|---|
committer | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
commit | 22cf644e03419b4c3d002109b021c7482306f0bf (patch) | |
tree | db426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-omap2/dsp.c | |
parent | Linux 3.9-rc6 (diff) | |
parent | ARM: exynos: restore mach/regs-clock.h for exynos5 (diff) | |
download | kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip |
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/dsp.c')
-rw-r--r-- | arch/arm/mach-omap2/dsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c index b155500e84a8..b8208b4b1bd9 100644 --- a/arch/arm/mach-omap2/dsp.c +++ b/arch/arm/mach-omap2/dsp.c @@ -26,7 +26,7 @@ #include "control.h" #include "cm2xxx_3xxx.h" #include "prm2xxx_3xxx.h" -#ifdef CONFIG_BRIDGE_DVFS +#ifdef CONFIG_TIDSPBRIDGE_DVFS #include "omap-pm.h" #endif @@ -35,7 +35,7 @@ static struct platform_device *omap_dsp_pdev; static struct omap_dsp_platform_data omap_dsp_pdata __initdata = { -#ifdef CONFIG_BRIDGE_DVFS +#ifdef CONFIG_TIDSPBRIDGE_DVFS .dsp_set_min_opp = omap_pm_dsp_set_min_opp, .dsp_get_opp = omap_pm_dsp_get_opp, .cpu_set_freq = omap_pm_cpu_set_freq, |