From 7e87ace934b19106862218e1500296ff8d92135f Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sun, 14 Feb 2010 23:39:32 -0300
Subject: [PATCH] --- yaml --- r: 181706 b: refs/heads/master c:
 7ccf1eea972177064b4df9d5ba68958604781db6 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/media/dvb/frontends/dibx000_common.c | 2 +-
 trunk/drivers/media/dvb/frontends/tda665x.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a3e2bea91ed..5f3c1f097bd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18718c96e3e10e6b821d32c50adde9fa5cc6565a
+refs/heads/master: 7ccf1eea972177064b4df9d5ba68958604781db6
diff --git a/trunk/drivers/media/dvb/frontends/dibx000_common.c b/trunk/drivers/media/dvb/frontends/dibx000_common.c
index e6f3d73db9d3..980e02f1575e 100644
--- a/trunk/drivers/media/dvb/frontends/dibx000_common.c
+++ b/trunk/drivers/media/dvb/frontends/dibx000_common.c
@@ -174,7 +174,7 @@ void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst)
 EXPORT_SYMBOL(dibx000_exit_i2c_master);
 
 
-u32 systime()
+u32 systime(void)
 {
     struct timespec t;
 
diff --git a/trunk/drivers/media/dvb/frontends/tda665x.c b/trunk/drivers/media/dvb/frontends/tda665x.c
index 87d52739c828..c44fefe92d97 100644
--- a/trunk/drivers/media/dvb/frontends/tda665x.c
+++ b/trunk/drivers/media/dvb/frontends/tda665x.c
@@ -133,7 +133,7 @@ static int tda665x_set_state(struct dvb_frontend *fe,
 		frequency += config->ref_divider >> 1;
 		frequency /= config->ref_divider;
 
-		buf[0] = (u8) (frequency & 0x7f00) >> 8;
+		buf[0] = (u8) ((frequency & 0x7f00) >> 8);
 		buf[1] = (u8) (frequency & 0x00ff) >> 0;
 		buf[2] = 0x80 | 0x40 | 0x02;
 		buf[3] = 0x00;