aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/davinci
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/media/video/davinci
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/media/video/davinci')
-rw-r--r--drivers/media/video/davinci/dm355_ccdc.c6
-rw-r--r--drivers/media/video/davinci/dm644x_ccdc.c4
-rw-r--r--drivers/media/video/davinci/vpss.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
index 4629cabe3f28..314390016370 100644
--- a/drivers/media/video/davinci/dm355_ccdc.c
+++ b/drivers/media/video/davinci/dm355_ccdc.c
@@ -285,7 +285,7 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
285 285
286 if ((ccdcparam->med_filt_thres < 0) || 286 if ((ccdcparam->med_filt_thres < 0) ||
287 (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { 287 (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) {
288 dev_dbg(dev, "Invalid value of median filter thresold\n"); 288 dev_dbg(dev, "Invalid value of median filter threshold\n");
289 return -EINVAL; 289 return -EINVAL;
290 } 290 }
291 291
@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
959 }, 959 },
960}; 960};
961 961
962static int dm355_ccdc_init(void) 962static int __init dm355_ccdc_init(void)
963{ 963{
964 printk(KERN_NOTICE "dm355_ccdc_init\n"); 964 printk(KERN_NOTICE "dm355_ccdc_init\n");
965 if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) 965 if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void)
969 return 0; 969 return 0;
970} 970}
971 971
972static void dm355_ccdc_exit(void) 972static void __exit dm355_ccdc_exit(void)
973{ 973{
974 vpfe_unregister_ccdc_device(&ccdc_hw_dev); 974 vpfe_unregister_ccdc_device(&ccdc_hw_dev);
975} 975}
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
index 2f19a919f477..d5fa193f32d2 100644
--- a/drivers/media/video/davinci/dm644x_ccdc.c
+++ b/drivers/media/video/davinci/dm644x_ccdc.c
@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
859 }, 859 },
860}; 860};
861 861
862static int dm644x_ccdc_init(void) 862static int __init dm644x_ccdc_init(void)
863{ 863{
864 printk(KERN_NOTICE "dm644x_ccdc_init\n"); 864 printk(KERN_NOTICE "dm644x_ccdc_init\n");
865 if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) 865 if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void)
869 return 0; 869 return 0;
870} 870}
871 871
872static void dm644x_ccdc_exit(void) 872static void __exit dm644x_ccdc_exit(void)
873{ 873{
874 vpfe_unregister_ccdc_device(&ccdc_hw_dev); 874 vpfe_unregister_ccdc_device(&ccdc_hw_dev);
875} 875}
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c
index 6d709ca8cfb0..453236bd7559 100644
--- a/drivers/media/video/davinci/vpss.c
+++ b/drivers/media/video/davinci/vpss.c
@@ -53,7 +53,7 @@ struct vpss_hw_ops {
53 int (*enable_clock)(enum vpss_clock_sel clock_sel, int en); 53 int (*enable_clock)(enum vpss_clock_sel clock_sel, int en);
54 /* select input to ccdc */ 54 /* select input to ccdc */
55 void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel); 55 void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel);
56 /* clear wbl overlflow bit */ 56 /* clear wbl overflow bit */
57 int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel); 57 int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel);
58}; 58};
59 59