xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xfree86/i2c/fi1236.c |    8 +++++---
 hw/xfree86/i2c/fi1236.h |    1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
diff-tree d97a21acb878bc4e5e6542912fbd820503bba312 (from 29c78321e86956c4ce0c1c899d82557f927e04da)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 14:36:54 2006 -0700

    fix compiler warnings in hw/xfree86/i2c/fi1236.c

diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index ea37414..742645b 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -99,6 +99,7 @@ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_IN
 }
 
 /* might be buggy */
+#if 0
 static void MT2032_shutdown(FI1236Ptr f)
 {
 CARD8 data[10];
@@ -124,6 +125,7 @@ I2C_WriteRead(&(f->d), (I2CByte *)data, 
 
 usleep(15000);
 }
+#endif
 
 static void MT2032_dump_status(FI1236Ptr f);
 
@@ -131,7 +133,7 @@ static void MT2032_init(FI1236Ptr f)
 {
 CARD8 data[10];
 CARD8 value;
-CARD8 xogc;
+CARD8 xogc = 0x00;
 
 MT2032_getid(f);
 
@@ -479,7 +481,7 @@ if(type==TUNER_TYPE_MT2032){
 }
 
 
-CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){
+static CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){
 FI1236Ptr f=(FI1236Ptr)data;
 if(FI1236_AFC(f))return 150;
 	else {
@@ -517,7 +519,7 @@ void FI1236_tune(FI1236Ptr f, CARD32 fre
 
 	 xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner band to %d\n", f->tuner_data.band);
 
-    xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", frequency);
+    xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", (int)frequency);
 
 	 if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W))
 	 {
diff --git a/hw/xfree86/i2c/fi1236.h b/hw/xfree86/i2c/fi1236.h
index dbb1546..7c1d070 100644
--- a/hw/xfree86/i2c/fi1236.h
+++ b/hw/xfree86/i2c/fi1236.h
@@ -90,6 +90,7 @@ typedef struct {
 FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr);
 void FI1236_set_tuner_type(FI1236Ptr f, int type);
 void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency);
+void FI1236_tune(FI1236Ptr f, CARD32 frequency);
 int FI1236_AFC(FI1236Ptr f);
 int TUNER_get_afc_hint(FI1236Ptr f);
 void fi1236_dump_status(FI1236Ptr f);