rk1000: fix compilation warning

diff --git a/drivers/mfd/rk1000-core.c b/drivers/mfd/rk1000-core.c
index 474e944be271c6a4b3f211a79fdf962161579703..ce5974f4b1f518085e4201a3e651d8992f83f414 100755 (executable)
--- a/drivers/mfd/rk1000-core.c
+++ b/drivers/mfd/rk1000-core.c
@@ -106,7 +106,7 @@ int rk1000_i2c_recv(const u8 addr, const u8 reg, const char *buf)
        return (ret == 2) ? 0 : -1;
 }
 
-static ssize_t rk1000_show(struct kobject *kobj, struct kobj_attribute *attr,char *buf)
+static ssize_t rk1000_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        int ret=-1;
       int i=0;

diff --git a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
index f73450f70efa713da3a29e4fb025117d5b1b27c5..3c8e4e81d6a8093cf6e52e3836338ce286c0ebc5 100755 (executable)
--- a/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
+++ b/drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
@@ -21,7 +21,7 @@ int rk1000_tv_ntsc_init(void)
        int ret;
 
        if(cvbsformat>=0){
-               return;
+               return 0;
        }
        
        for (i = 0; i < sizeof(tv_encoder_regs); i++) {
@@ -53,7 +53,7 @@ int rk1000_tv_pal_init(void)
        int ret;
 
        if(cvbsformat>=0){
-               return;
+               return 0;
        }
        
        for (i = 0; i < sizeof(tv_encoder_regs); i++) {