diff options
| author | Arve Hjønnevåg <arve@android.com> | 2011-04-01 19:30:47 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:54:03 -0800 |
| commit | 27ab42965d4396fe458c58bd3c6dbad06c70f97e (patch) | |
| tree | f55096bfae3272ad0f2ca99318246e92fe0b232f /arch | |
| parent | cc5c1a19d7c030e8cc0a3e8801779d051195c98c (diff) | |
| download | kernel_samsung_crespo-27ab42965d4396fe458c58bd3c6dbad06c70f97e.zip kernel_samsung_crespo-27ab42965d4396fe458c58bd3c6dbad06c70f97e.tar.gz kernel_samsung_crespo-27ab42965d4396fe458c58bd3c6dbad06c70f97e.tar.bz2 | |
ARM: s5pv210: Fix build error when CPU_FREQ is enabled without VIDEO_FIMC
Change-Id: Ic587bf85e0ea0b66a38227fae31035dddf5e0848
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/devs.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 13c9e88..b564c24 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -246,21 +246,21 @@ config S5P_ADC config S5PV210_SETUP_FIMC0 bool - depends on VIDEO_FIMC + depends on VIDEO_FIMC || CPU_FREQ default y help Common setup code for FIMC controller 0. config S5PV210_SETUP_FIMC1 bool - depends on VIDEO_FIMC + depends on VIDEO_FIMC || CPU_FREQ default y help Common setup code for FIMC controller 1. config S5PV210_SETUP_FIMC2 bool - depends on VIDEO_FIMC + depends on VIDEO_FIMC || CPU_FREQ default y help Common setup code for FIMC controller 2. diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 1df2f11..c2a98b8 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -123,6 +123,7 @@ config HRT_RTC # MFC part config S5P_DEV_MFC bool + default y if CPU_FREQ default n help Compile in platform device definitions for MFC diff --git a/arch/arm/plat-s5p/devs.c b/arch/arm/plat-s5p/devs.c index 29a8b47..fc9c347 100644 --- a/arch/arm/plat-s5p/devs.c +++ b/arch/arm/plat-s5p/devs.c @@ -351,7 +351,7 @@ void __init s3cfb_set_platdata(struct s3c_platform_fb *pd) } #endif -#ifdef CONFIG_VIDEO_FIMC +#if defined(CONFIG_VIDEO_FIMC) || defined(CONFIG_CPU_FREQ) /* TODO: use existing dev */ static struct resource s3c_fimc0_resource[] = { [0] = { .start = S5P_PA_FIMC0, |