diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 12:34:41 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 12:34:41 +0100 |
| commit | 60571f98d292b74586ff8330d8bc965eb01e8df0 (patch) | |
| tree | 8d4f14f4a99b8b465828a314620f3b3aa030713f /arch/arm/mach-exynos/mach-universal_c210.c | |
| parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
| parent | ARM: SAMSUNG: use static declaration when it is not used in other files (diff) | |
| download | linux-60571f98d292b74586ff8330d8bc965eb01e8df0.tar.xz linux-60571f98d292b74586ff8330d8bc965eb01e8df0.zip | |
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
Conflicts:
arch/arm/mach-exynos/dma.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5pc100/dma.c
arch/arm/mach-s5pv210/dma.c
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 37ac93e8d6d9..29c8e188d8e7 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"); |