diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:22:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:22:20 -0700 |
| commit | 6307e418251240c2d18b3d69b96e50176c51a113 (patch) | |
| tree | 425dd6e83c560d05afdbd5578da5003a117a20dc /arch/arm/mach-exynos/mach-universal_c210.c | |
| parent | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (diff) | |
| parent | efd9960b0e1bdfe48490504a8166ffdbcc466dba (diff) | |
Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
ARM: EXYNOS: Enable MDMA driver
(includes dependent base of samsung/cleanup-exynos-clock)
Diffstat (limited to 'arch/arm/mach-exynos/mach-universal_c210.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index f0dcca47fed..44553933b14 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -997,7 +997,7 @@ static void __init universal_map_io(void) s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); } -void s5p_tv_setup(void) +static void s5p_tv_setup(void) { /* direct HPD to HDMI chip */ gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug"); |