aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 5b36b6c5b448..d41c01f83f15 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1192,8 +1192,8 @@ static struct platform_device sh_mmcif_device = {
1192}; 1192};
1193 1193
1194 1194
1195static int mackerel_camera_add(struct soc_camera_link *icl, struct device *dev); 1195static int mackerel_camera_add(struct soc_camera_device *icd);
1196static void mackerel_camera_del(struct soc_camera_link *icl); 1196static void mackerel_camera_del(struct soc_camera_device *icd);
1197 1197
1198static int camera_set_capture(struct soc_camera_platform_info *info, 1198static int camera_set_capture(struct soc_camera_platform_info *info,
1199 int enable) 1199 int enable)
@@ -1232,16 +1232,15 @@ static void mackerel_camera_release(struct device *dev)
1232 soc_camera_platform_release(&camera_device); 1232 soc_camera_platform_release(&camera_device);
1233} 1233}
1234 1234
1235static int mackerel_camera_add(struct soc_camera_link *icl, 1235static int mackerel_camera_add(struct soc_camera_device *icd)
1236 struct device *dev)
1237{ 1236{
1238 return soc_camera_platform_add(icl, dev, &camera_device, &camera_link, 1237 return soc_camera_platform_add(icd, &camera_device, &camera_link,
1239 mackerel_camera_release, 0); 1238 mackerel_camera_release, 0);
1240} 1239}
1241 1240
1242static void mackerel_camera_del(struct soc_camera_link *icl) 1241static void mackerel_camera_del(struct soc_camera_device *icd)
1243{ 1242{
1244 soc_camera_platform_del(icl, camera_device, &camera_link); 1243 soc_camera_platform_del(icd, camera_device, &camera_link);
1245} 1244}
1246 1245
1247static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 1246static struct sh_mobile_ceu_info sh_mobile_ceu_info = {