xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/i2c/fi1236.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 35d208125fa0ec78e8d694adc52886b977e789cf
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Wed Apr 21 18:28:13 2010 +0300

    xfree86: fix not reached code in fi1236 driver from i2c
    
    This issue was introduced in the first dump of the code in 2004. I haven't
    check what's the correct fix for it so I simply kept the behaviour of someone
    calling this and removed the unreachable code.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index 7c39edb..61224ea 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -398,10 +398,6 @@ int TUNER_get_afc_hint(FI1236Ptr f)
 {
 if(f->afc_timer_installed)return TUNER_STILL_TUNING;
 return f->last_afc_hint;
-if(f->type==TUNER_TYPE_MT2032)
-	return MT2032_get_afc_hint(f);
-	else
-	return FI1236_get_afc_hint(f);
 }
 
 static void MT2032_dump_status(FI1236Ptr f)