diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/mach-s5pv210/mach-goni.c | |
parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) | |
download | blackbird-op-linux-e7051e9dab77ddeaddbe12364939ae239d92ca73.tar.gz blackbird-op-linux-e7051e9dab77ddeaddbe12364939ae239d92ca73.zip |
Merge branch 'samsung/exynos5' into next/soc2
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-goni.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index ff9152610439..2cf5ed75f390 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -844,7 +844,7 @@ static struct s5p_fimc_isp_info goni_camera_sensors[] = { }, }; -struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { +static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { .isp_info = goni_camera_sensors, .num_clients = ARRAY_SIZE(goni_camera_sensors), }; |