diff options
| author | Kukjin Kim | 2012-12-06 09:02:44 +0100 |
|---|---|---|
| committer | Kukjin Kim | 2012-12-19 04:00:25 +0100 |
| commit | ade7ffbb9b6f2ab65e69496bc4076e215e2cd8ba (patch) | |
| tree | 917c42855cf1e18699c3296cb6ba0a29221b9b14 | |
| parent | Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux (diff) | |
| download | kernel-qcow2-linux-ade7ffbb9b6f2ab65e69496bc4076e215e2cd8ba.tar.gz kernel-qcow2-linux-ade7ffbb9b6f2ab65e69496bc4076e215e2cd8ba.tar.xz kernel-qcow2-linux-ade7ffbb9b6f2ab65e69496bc4076e215e2cd8ba.zip | |
ARM: EXYNOS: fix build error when MFC is not selected
This fixes following:
arch/arm/mach-exynos/built-in.o: In function `exynos5_reserve':
arch/arm/mach-exynos/mach-exynos5-dt.c:177: undefined reference to `s5p_fdt_find_mfc_mem'
arch/arm/mach-exynos/mach-exynos5-dt.c:177: undefined reference to `s5p_fdt_find_mfc_mem'
arch/arm/mach-exynos/mach-exynos5-dt.c:178: undefined reference to `s5p_mfc_reserve_mem'
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index f038c8cadca4..e99d3d8f2bcf 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -163,6 +163,7 @@ static char const *exynos5_dt_compat[] __initdata = { static void __init exynos5_reserve(void) { +#ifdef CONFIG_S5P_DEV_MFC struct s5p_mfc_dt_meminfo mfc_mem; /* Reserve memory for MFC only if it's available */ @@ -170,6 +171,7 @@ static void __init exynos5_reserve(void) if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem)) s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff, mfc_mem.lsize); +#endif } DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") |